--- testdisk-6.8/src/file_jpg.c	2007-07-17 23:44:07.000000000 +0200
+++ testdisk-6.8.new/src/file_jpg.c	2007-12-23 13:39:56.000000000 +0100

@@ -394,18 +393,18 @@
       (void) jpeg_read_scanlines(&cinfo, buffer, 1);
     }
     (void) jpeg_finish_decompress(&cinfo);
-    jpeg_destroy_decompress(&cinfo);
-  }
-#endif
-  /* Not accurate */
-//  jpeg_size=ftell(infile);
-//  log_error("JPG offset %llu\n", (long long unsigned)jpeg_size);
   {
     my_source_mgr * src;
     src = (my_source_mgr *) cinfo.src;
     jpeg_size=src->file_size - src->pub.bytes_in_buffer;
-//    log_error("JPG size: %llu\n", (long long unsigned)jpeg_size);
   }
+    jpeg_destroy_decompress(&cinfo);
+  }
+#else
+  /* Not accurate */
+  jpeg_size=ftell(infile);
+#endif
+//    log_error("JPG size: %llu\n", (long long unsigned)jpeg_size);
   if(jpeg_size<=0)
     return;
 #if defined(HAVE_LIBJPEG) && defined(HAVE_JPEGLIB_H)