Merge pull request #22 from miz999/thumbnail-identify-bugfix

Thumbnail identify bugfix(再送)

ChangeLog

@@ -8,6 +8,10 @@
 
 2012-06-18  MIZUNUMA Yuto  <mizmiz@sf.net>
 
+	* navi2ch-thumbnail.el (navi2ch-thumbnail-image-jpeg-identify):
+	SOF2で画像サイズ取得
+	(navi2ch-thumbnail-image-identify): filereadサイズで無限ループに入っていた
+
 	* navi2ch-oyster.el (navi2ch-oyster-login): ID取得エラー表示の簡素化と厳密化
 	インデントの整理
 

navi2ch-thumbnail.el

@@ -591,9 +591,7 @@
 	   ((= code #xffc4))
            ;; APP
            ((and (>= code #xffe0) (<= code #xffed)))
-           ;; SOF2
-           ((= code #xffc2))
-           ;; SOF0 DCT
+           ;; SOF0(baseline) or SOF2(progressive)
 	   ((and (>= code #xffc0) (<= code #xffcF))
 	    (let ((sample (aref data (+ i 4)))
 		  (ysize (+ (lsh (aref data (+ i 5)) 8)
@@ -717,15 +715,15 @@
 	(if rtn (throw 'identify rtn)))
 
       ;; $B>pJs$,<hF@$G$-$J$+$C$?>l9g$O%X%C%@$r$5$i$KFI$_9~$`(B
-      (setq size (* size 10))
-      (if (> size file-size)
-	  (setq size file-size))
-;      (message "navi2ch-thumbnail-image-identify:re-read size=%s %s" size file)
-      (setq rtn (navi2ch-thumbnail-image-identify file size))
-      (if rtn (throw 'identify rtn))
+      (when (not (= size file-size))
+        (setq size (* size 10))
+        (if (> size file-size)
+            (setq size file-size))
+        (setq rtn (navi2ch-thumbnail-image-identify file size))
+        (if rtn (throw 'identify rtn)))
+
       ;; $B$=$l$G$bL5M}$J$i30It%W%m%0%i%`$KMj$k(B
-      (when (and (= size file-size)
-		 navi2ch-thumbnail-image-identify-program)
+      (when navi2ch-thumbnail-image-identify-program
 	(message "identify called %s" file)
 	(with-temp-buffer
           (cond