Attachment 30694 Details for Bug 24733 – Patch to the problem

[patch] Patch to the problem

movie_size_crash.patch (text/plain), 3.98 KB, created by Ilya Gorenbein on 2009-10-26 06:12:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilya Gorenbein

Created: 2009-10-26 06:12:17 UTC

Size: 3.98 KB

patch

obsolete

>*** poppler/Annot.cc	2009-09-02 18:48:16.000000000 +0000
>--- poppler/Annot_new.cc	2009-10-26 10:03:59.000000000 +0000
>***************
>*** 3539,3547 ****
>        Array* aspect = obj1.getArray();
>        if (aspect->getLength() >= 2) {
>  	Object tmp;
>! 	width = aspect->get(0, &tmp)->getInt();
>  	tmp.free();
>! 	height = aspect->get(1, &tmp)->getInt();
>  	tmp.free();
>        }
>      }
>--- 3539,3549 ----
>        Array* aspect = obj1.getArray();
>        if (aspect->getLength() >= 2) {
>  	Object tmp;
>!     if( aspect->get(0, &tmp)->isNum() )
>!         width = aspect->get(0, &tmp)->getNum();
>  	tmp.free();
>!     if( aspect->get(1, &tmp)->isNum() )
>!         height = aspect->get(1, &tmp)->getNum();
>  	tmp.free();
>        }
>      }
>***************
>*** 3726,3732 ****
>    aDict.free();
>  }
>  
>! void AnnotMovie::getMovieSize(int& width, int& height) {
>    width = this->width;
>    height = this->height;
>  }
>--- 3728,3734 ----
>    aDict.free();
>  }
>  
>! void AnnotMovie::getMovieSize(double& width, double& height) {
>    width = this->width;
>    height = this->height;
>  }
>*** qt4/src/poppler-qt4.h	2009-09-05 13:20:14.000000000 +0000
>--- qt4/src/poppler-qt4_new.h	2009-10-26 12:02:09.000000000 +0000
>***************
>*** 1522,1528 ****
>  	/**
>  	   The size of the movie
>  	*/
>! 	QSize size() const;
>  
>  	/**
>  	   The rotation (either 0, 90, 180, or 270 degrees clockwise) for the movie,
>--- 1522,1528 ----
>  	/**
>  	   The size of the movie
>  	*/
>! 	QSizeF size() const;
>  
>  	/**
>  	   The rotation (either 0, 90, 180, or 270 degrees clockwise) for the movie,
>*** qt4/src/poppler-movie.cc	2009-09-02 18:48:16.000000000 +0000
>--- qt4/src/poppler-movie_new.cc	2009-10-26 11:56:36.000000000 +0000
>***************
>*** 38,44 ****
>  	}
>  
>  	Movie *m_movieObj;
>! 	QSize m_size;
>  	int m_rotation;
>  	MovieObject::PlayMode m_playMode : 3;
>  	bool m_showControls : 1;
>--- 38,44 ----
>  	}
>  
>  	Movie *m_movieObj;
>! 	QSizeF m_size;
>  	int m_rotation;
>  	MovieObject::PlayMode m_playMode : 3;
>  	bool m_showControls : 1;
>***************
>*** 65,71 ****
>  	return goo ? QString( goo->getCString() ) : QString();
>  }
>  
>! QSize MovieObject::size() const
>  {
>  	return m_movieData->m_size;
>  }
>--- 65,71 ----
>  	return goo ? QString( goo->getCString() ) : QString();
>  }
>  
>! QSizeF MovieObject::size() const
>  {
>  	return m_movieData->m_size;
>  }
>*** poppler/Movie.cc	2009-09-02 18:48:16.000000000 +0000
>--- poppler/Movie_new.cc	2009-10-26 10:06:47.000000000 +0000
>***************
>*** 160,166 ****
>      windowParams.type = MovieWindowParameters::movieWindowFullscreen;
>    }
>  
>!   int w, h;
>    int znum, zdenum;
>    annot->getMovieSize(w, h);
>    annot->getZoomFactor(znum, zdenum);
>--- 160,166 ----
>      windowParams.type = MovieWindowParameters::movieWindowFullscreen;
>    }
>  
>!   double w, h;
>    int znum, zdenum;
>    annot->getMovieSize(w, h);
>    annot->getZoomFactor(znum, zdenum);
>*** poppler/Annot.h	2009-09-02 18:48:16.000000000 +0000
>--- poppler/Annot_new.h	2009-10-26 10:00:34.000000000 +0000
>***************
>*** 740,746 ****
>    GBool needFullscreen() { return isFullscreen; }
>    
>    
>!   void getMovieSize(int& width, int& height);
>    void getZoomFactor(int& num, int& denum);
>    void getWindowPosition(double& x, double& y) { x = FWPosX; y = FWPosY; }
>  
>--- 740,746 ----
>    GBool needFullscreen() { return isFullscreen; }
>    
>    
>!   void getMovieSize(double& width, double& height);
>    void getZoomFactor(int& num, int& denum);
>    void getWindowPosition(double& x, double& y) { x = FWPosX; y = FWPosY; }
>  
>***************
>*** 752,759 ****
>    GooString* title;      // T
>    GooString* fileName;   // Movie/F
>  
>!   int width;             // Movie/Aspect
>!   int height;            // Movie/Aspect
>    int rotationAngle;     // Movie/Rotate
>  
>    PosterType posterType; // Movie/Poster
>--- 752,759 ----
>    GooString* title;      // T
>    GooString* fileName;   // Movie/F
>  
>!   double width;             // Movie/Aspect
>!   double height;            // Movie/Aspect
>    int rotationAngle;     // Movie/Rotate
>  
>    PosterType posterType; // Movie/Poster

Actions: View | Splinter Review

Attachments on bug 24733: 30694 | 30762

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.