# HG changeset patch
# User kostya
# Date 1163395735 0
# Node ID c70922cdf2eee35b00c3a1b94f566846203ff770
# Parent  17d005bf07f28049dad8453a6f5fd8c06b7ddd63
Correctly detect 4-component images

diff -r 17d005bf07f2 -r c70922cdf2ee tiff.c
--- a/tiff.c	Mon Nov 13 05:15:55 2006 +0000
+++ b/tiff.c	Mon Nov 13 05:28:55 2006 +0000
@@ -242,11 +242,12 @@
         else{
             switch(type){
             case TIFF_BYTE:
-                s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF);
+                s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF) + ((off >> 24) & 0xFF);
                 break;
             case TIFF_SHORT:
             case TIFF_LONG:
-                s->bpp = tget(&buf, type, s->le) + tget(&buf, type, s->le) + tget(&buf, type, s->le);
+                s->bpp = 0;
+                for(i = 0; i < count; i++) s->bpp += tget(&buf, type, s->le);
                 break;
             default:
                 s->bpp = -1;