TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

use putback() instead of seekg()

Browse Source
This commit is contained in:
David Rose 2002-08-07 22:44:21 +00:00
parent af97bce709
commit 4e256ae596
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/pnmimagetypes/pnmFileTypeJPG.h
View File

@ -83,6 +83,8 @@ public:
pixval R[256]; /* reds */ pixval R[256]; /* reds */
pixval G[256]; /* greens */ pixval G[256]; /* greens */
pixval B[256]; /* blues */ pixval B[256]; /* blues */
bool _is_valid;
}; };
class Writer : public PNMWriter { class Writer : public PNMWriter {

25
panda/src/pnmimagetypes/pnmFileTypeJPGReader.cxx
View File

@ -256,8 +256,19 @@ PNMFileTypeJPG::Reader::
Reader(PNMFileType *type, istream *file, bool owns_file, string magic_number) : Reader(PNMFileType *type, istream *file, bool owns_file, string magic_number) :
PNMReader(type, file, owns_file) PNMReader(type, file, owns_file)
{ {
// Put the magic number bytes back into the file // Hope we can putback() more than one character.
file->seekg(0); for (string::reverse_iterator mi = magic_number.rbegin();
mi != magic_number.rend();
mi++) {
_file->putback(*mi);
}
if (_file->fail()) {
pnmimage_jpg_cat.error()
<< "Unable to put back magic number.\n";
_is_valid = false;
return;
}
_is_valid = true;
/* Step 1: allocate and initialize JPEG decompression object */ /* Step 1: allocate and initialize JPEG decompression object */
@ -302,8 +313,11 @@ Reader(PNMFileType *type, istream *file, bool owns_file, string magic_number) :
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PNMFileTypeJPG::Reader:: PNMFileTypeJPG::Reader::
~Reader(void) { ~Reader() {
jpeg_destroy_decompress(&_cinfo); if (_is_valid) {
jpeg_destroy_decompress(&_cinfo);
_is_valid = false;
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -321,6 +335,9 @@ PNMFileTypeJPG::Reader::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
int PNMFileTypeJPG::Reader:: int PNMFileTypeJPG::Reader::
read_data(xel *array, xelval *) { read_data(xel *array, xelval *) {
if (!_is_valid) {
return 0;
}
JSAMPARRAY buffer; /* Output row buffer */ JSAMPARRAY buffer; /* Output row buffer */
int row_stride; /* physical row width in output buffer */ int row_stride; /* physical row width in output buffer */

2
panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
View File

@ -318,7 +318,7 @@ Reader(PNMFileType *type, istream *file, bool owns_file, string magic_number) :
unsigned short* greencolormap; unsigned short* greencolormap;
unsigned short* bluecolormap; unsigned short* bluecolormap;
// Hope we can ungetc() more than one character. // Hope we can putback() more than one character.
for (string::reverse_iterator mi = magic_number.rbegin(); for (string::reverse_iterator mi = magic_number.rbegin();
mi != magic_number.rend(); mi != magic_number.rend();
mi++) { mi++) {