Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No code changes.

Browse Source 
Renamed variable bpp (bits per pixel) in TIFF handler to what it actually represents: bps (bits per sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-08-19 01:31:07 +00:00
parent d65172db90
commit 096c930c16
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/imagtiff.cpp
View File

@@ -437,7 +437,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
} }
uint16 spp, bpp, compression; uint16 spp, bps, compression;
/* /*
Read some baseline TIFF tags which helps when re-saving a TIFF Read some baseline TIFF tags which helps when re-saving a TIFF
to be similar to the original image. to be similar to the original image.
@@ -447,9 +447,9 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
image->SetOption(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, spp); image->SetOption(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, spp);
} }
if ( TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp) ) if ( TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bps) )
{ {
image->SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, bpp); image->SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, bps);
} }
if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) ) if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) )
@@ -591,9 +591,9 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
if ( !spp ) if ( !spp )
spp = 3; spp = 3;
int bpp = image->GetOptionInt(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE); int bps = image->GetOptionInt(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE);
if ( !bpp ) if ( !bps )
bpp = 8; bps = 8;
int compression = image->GetOptionInt(wxIMAGE_OPTION_TIFF_COMPRESSION); int compression = image->GetOptionInt(wxIMAGE_OPTION_TIFF_COMPRESSION);
if ( !compression ) if ( !compression )
@@ -606,20 +606,20 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
} }
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp); TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bpp); TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, spp*bpp == 1 ? PHOTOMETRIC_MINISBLACK TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, spp*bps == 1 ? PHOTOMETRIC_MINISBLACK
: PHOTOMETRIC_RGB); : PHOTOMETRIC_RGB);
TIFFSetField(tif, TIFFTAG_COMPRESSION, compression); TIFFSetField(tif, TIFFTAG_COMPRESSION, compression);
// scanlinesize if determined by spp and bpp // scanlinesize if determined by spp and bps
tsize_t linebytes = (tsize_t)image->GetWidth() * spp * bpp / 8; tsize_t linebytes = (tsize_t)image->GetWidth() * spp * bps / 8;
if ( (image->GetWidth() % 8 > 0) && (spp * bpp < 8) ) if ( (image->GetWidth() % 8 > 0) && (spp * bps < 8) )
linebytes+=1; linebytes+=1;
unsigned char *buf; unsigned char *buf;
if (TIFFScanlineSize(tif) > linebytes || (spp * bpp < 24)) if (TIFFScanlineSize(tif) > linebytes || (spp * bps < 24))
{ {
buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif)); buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
if (!buf) if (!buf)
@@ -646,7 +646,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
{ {
if ( buf ) if ( buf )
{ {
if ( spp * bpp > 1 ) if ( spp * bps > 1 )
{ {
// color image // color image
memcpy(buf, ptr, image->GetWidth()); memcpy(buf, ptr, image->GetWidth());