Changeset 34084

Timestamp:

Jun 26, 2012, 11:28:48 AM (14 years ago)

Author:

eugene

Message:

added -show-camera and -format options

Location:

trunk/ppStats

Files:

• configure.ac (modified) (2 diffs)
• src/ppStats.c (modified) (1 diff)
• src/ppStats.h (modified) (1 diff)
• src/ppStatsSetupFromArgs.c (modified) (2 diffs)

trunk/ppStats/configure.ac

@@ -8 +8 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -21 +21 @@
 
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror -std=c99"
+IPP_STDCFLAGS
+
+dnl not clear why the below is needed
+CFLAGS="${CFLAGS=} -std=c99"
 
 IPP_VERSION

trunk/ppStats/src/ppStats.c

@@ -50 +50 @@
         psErrorStackPrint(stderr, "Error in stats loop.\n");
         exit (status);
+    }
+
+    if (data->showFormat) {
+      char *formatName = psStringCopy (config->formatName);
+      if (!formatName) {
+        formatName = psStringCopy ("UNKNOWN");
+      }
+      psMetadataAddStr(results, PS_LIST_HEAD, "FILE.FORMAT", 0, "File format", formatName);
+    }
+
+    if (data->showCamera) {
+      char *cameraName = psStringCopy (config->cameraName);
+      if (!cameraName) {
+        cameraName = psStringCopy ("UNKNOWN");
+      }
+      psMetadataAddStr(results, PS_LIST_HEAD, "CAMERA", 0, "camera name", cameraName);
     }
 

trunk/ppStats/src/ppStats.h

@@ -15 +15 @@
     bool doStats;                       // Do pixel statistics?
     bool fileLevel;                     // Output file level?
+    bool showFormat;                    // Output file format?
+    bool showCamera;                    // Output camera name?
     pmFPAview *fileView;                // View to analyse
 

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -104 +104 @@
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-sample", 0, "Sampling fraction", 0.0);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-level", 0, "File level", 0);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-format", 0, "Show File format", 0);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-show-camera", 0, "Show Camera name", 0);
 
     if (*argc == 1) {
@@ -144 +146 @@
     data->sample = psMetadataLookupF32(NULL, arguments, "-sample");
     data->fileLevel = psMetadataLookupBool(NULL, arguments, "-level");
+    data->showFormat = psMetadataLookupBool(NULL, arguments, "-format");
+    data->showCamera = psMetadataLookupBool(NULL, arguments, "-show-camera");
     data->fileView = NULL;