Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / common / imagtiff.cpp

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 088dd1497928f587d192945b98dee48fe7581dba..2bbfa1071a9a238d4833dcdd86ed75fa9cce5791 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -31,7 +31,6 @@ extern "C"
 {
     #include "tiff.h"
     #include "tiffio.h"
-    #include "tiffiop.h"
 }
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
@@ -113,9 +112,6 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
         _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
         _tiffMapProc, _tiffUnmapProc);
 
-    if (tif)
-        tif->tif_fd = (int) &stream;
-
     return tif;
 }
 
@@ -193,7 +189,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 
     for (uint32 i = 0; i < h; i++)
     {
-        for (uint32 j = 0; j < h; j++)
+        for (uint32 j = 0; j < w; j++)
         {
             unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]);
             if (alpha < 127)