Show if the image is a progressive jpeg in view detail

fairclothjm · Mar 19, 2021 · af6e695 · af6e695
1 parent 1e83fdb
commit af6e695
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/browse/view.c b/browse/view.c
@@ -154,7 +154,15 @@ void DoJpegView(char * ImagePath)
     free(dir);
 
     printf("<p>Date, time: %s<br>\n",ImageInfo.DateTime);
-    printf("Image size: %d x %d<br>\n",ImageInfo.Width, ImageInfo.Height);
+    printf("Image size: %d x %d",ImageInfo.Width, ImageInfo.Height);
+    if (ImageInfo.Process != 0xc0){
+        if (ImageInfo.Process == 0xc2){
+            printf(" (Progressive)");
+        }else{
+            printf(" (Process=%02x",ImageInfo.Process);
+        }
+    }
+    printf("<br>\n");
 
     if (ImageInfo.ExposureTime || ImageInfo.ISOequivalent || ImageInfo.ApertureFNumber){
         printf("Exposure: ");

diff --git a/src/jhead.h b/src/jhead.h
@@ -67,6 +67,8 @@ typedef struct {
     char  DateTime     [20];
     unsigned Height, Width;
     int   Orientation;
+    int   IsColor;
+    int   Process;    
     int   FlashUsed;
     float FocalLength;
     float ExposureTime;

diff --git a/src/jpgfile.c b/src/jpgfile.c
@@ -51,12 +51,12 @@ static void process_SOFn (const uchar * Data, int marker)
     num_components = Data[7];
 
     if (num_components == 3){
-        //ImageInfo.IsColor = 1;
+        ImageInfo.IsColor = 1;
     }else{
-        //ImageInfo.IsColor = 0;
+        ImageInfo.IsColor = 0;
     }
 
-    //ImageInfo.Process = marker;
+    ImageInfo.Process = marker;
 
     if (ShowTags){
         printf("JPEG image is %uw * %uh, %d color components, %d bits per sample\n",