[poppler] poppler/poppler: JPXStream.cc,1.4,1.5

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv29371/poppler

Modified Files:
	JPXStream.cc 
Log Message:
Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz for notifying


Index: JPXStream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/JPXStream.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- JPXStream.cc	1 Dec 2005 22:45:10 -0000	1.4
+++ JPXStream.cc	4 Dec 2005 18:53:40 -0000	1.5
@@ -825,8 +825,6 @@
 	return gFalse;
       }
       img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
-      img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
-				      sizeof(JPXTile));
       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
 	img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
 							 sizeof(JPXTileComp));