Example update : Rosetta extract DOM variant.

Author: BlockoS

examples/CMakeLists.txt

@@ -10,11 +10,12 @@ find_package(CFITSIO)
 
 include_directories(${CFITSIO_INCLUDE_DIR} ..)
 
-add_library(tinypds STATIC ../tinypds.c)
-set_property(TARGET tinypds PROPERTY C_STANDARD 99)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wshadow -Wextra")
 
-add_executable(rosetta_extract rosetta_extract.c)
+add_executable(rosetta_extract rosetta_extract.c utils.c)
 set_property(TARGET rosetta_extract PROPERTY C_STANDARD 99)
-target_link_libraries(rosetta_extract tinypds ${CFITSIO_LIBRARIES})
+target_link_libraries(rosetta_extract ${CFITSIO_LIBRARIES})
 
+add_executable(rosetta_extract_dom rosetta_extract_dom.c utils.c)
+set_property(TARGET rosetta_extract PROPERTY C_STANDARD 99)
+target_link_libraries(rosetta_extract_dom ${CFITSIO_LIBRARIES})

examples/rosetta_extract.c

@@ -10,50 +10,26 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+
+#define TINY_PDS_IMPL
 #include <tinypds.h>
-#include <fitsio.h>
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-#endif
+#include "utils.h"
 
 const char *g_image_string = "IMAGE";
 
 void usage()
 {
-    fprintf(stderr, "rosetta_extract input.pds out.fits\n");
+    fprintf(stderr, "rosetta_extract name input.pds out.fits\n"
+                    "    name is either IMAGE, SIGMA_MAP_IMAGE or QUALITY_MAP_IMAGE\n");
 }
-/** Sample type **/
-enum PDS_SAMPLE_TYPE
-{
-    /** Unknown type. */
-    PDS_SAMPLE_UNKNOWN_TYPE = 0,
-    /** LSB unsigned integer. **/
-    PDS_SAMPLE_UINT_LSB,
-    /** 32 bits IEEE float. **/
-    PDS_SAMPLE_FLOAT
-};
 /** Element type **/
 enum PDS_ELEMENT_TYPE
 {
     PDS_NONE = 0,
     PDS_ATTRIBUTE,
     PDS_POINTER
 };
-/** PDS image structure. **/
-typedef struct
-{
-    /** Line count (height). **/
-    size_t lines;
-    /** Samples per line (width). **/
-    size_t samples_per_line;
-    /** Sample type (float, uint, etc...). **/
-    uint8_t sample_type;
-    /** Sample size in bits (bits per pixel). **/
-    size_t sample_bits;
-    /** Band count (component count). **/
-    size_t bands;
-} PDS_image;
 /** PDS parser payload. **/
 typedef struct PDS_payload_t
 {
@@ -82,13 +58,6 @@ typedef struct
     /** Attribute parser. */
     int (*parser)(const PDS_scalar*, PDS_payload*);
 } PDS_attributes_infos;
-/**
- * Returns a pointer to the last character of a null terminated string.
- */
-const char* str_last(const char *str)
-{
-    return str + strlen(str) - 1;    
-}
 /**
  * Check if the PDS scalar holds an unsigned integer.
  * @param [in] scalar PDS scalar.
@@ -113,33 +82,6 @@ int record_size(const PDS_scalar *scalar, PDS_payload *payload)
     payload->record_size = (size_t)scalar->integer.value;
     return 1;
 }
-/**
- * Convert sample type name to PDS_SAMPLE_TYPE.
- * @param [in] first Pointer to the first character of the type name.
- * @param [in] last  Pointer to the last character of the type name.
- * @return PDS_SAMPLE_TYPE associated to the sample type name, or PDS_SAMPLE_UNKNOWN_TYPE if no type name matches.
- */
-uint8_t convert_type_name(const char *first, const char *last)
-{
-    static const struct
-    {
-        const char *name;
-        uint8_t type;
-    } type_names[] =
-    {
-        { "LSB_UNSIGNED_INTEGER", PDS_SAMPLE_UINT_LSB },
-        { "PC_REAL", PDS_SAMPLE_FLOAT }
-    };
-    size_t i;
-    for(i=0; i<ARRAY_SIZE(type_names); i++)
-    {
-        if(PDS_string_case_compare(type_names[i].name, str_last(type_names[i].name), first, last))
-        {
-            return type_names[i].type;
-        }
-    }
-    return PDS_SAMPLE_UNKNOWN_TYPE;
-}
 /**
  * Get image record from PDS scalar.
  * @param [in] scalar  PDS scalar.
@@ -372,7 +314,8 @@ int parse_scalar(const PDS_scalar *scalar, void *user_data)
 }
 /**
  * Global pointer parser.
- * We are only interested in IMAGE pointer. The rest is ignored.
+ * We are only interested in the pointer associated to the image. 
+ * The rest is ignored.
  * @param [in]     first     Pointer to the first character of the pointer name.
  * @param [in]     last      Pointer to the last character of the pointer name.
  * @param [in,out] user_data PDS parser user data.
@@ -430,7 +373,8 @@ int dummy_begin_end(void *user_data)
 }
 /**
  * Object start callback.
- * Only IMAGE object is being parsed. All other objects are ignored.
+ * Only the specified image object is being parsed.
+ * All other objects are ignored.
  * @param [in]     first     Pointer to the first character of the object name.
  * @param [in]     last      Pointer to the last character of the object name.
  * @param [in,out] user_data PDS parser user data.
@@ -457,7 +401,8 @@ int object_begin(const char *first, const char *last, void *user_data)
 }
 /**
  * Object end callback.
- * Only IMAGE object is being parsed. All other objects are ignored.
+ * Only the specified image object is being parsed.
+ * All other objects are ignored.
  * @param [in]     first     Pointer to the first character of the object name.
  * @param [in]     last      Pointer to the last character of the object name.
  * @param [in,out] user_data PDS parser user data.
@@ -523,132 +468,6 @@ int group_end(const char *first, const char *last, void *user_data)
     (void)last;
     return 1;
 }
-/**
- * Store file content to memory.
- * @param [in]  filename Source filename.
- * @param [out] buffer   Destination buffer.
- * @param [out] len      Bytes stored.
- * @return 1 if the whole file content was succesfully tranfered to the destination buffer.
- *         0 if an error occured.
- */
-int buffer_from_file(const char *filename, char **buffer, size_t *len)
-{
-    FILE *stream;
-    char *data;
-    size_t size;
-
-    *buffer = NULL;
-    *len = 0;
-
-    stream = fopen(filename, "rb");
-    if(NULL == stream)
-    {
-        fprintf(stderr, "failed to open %s: %s\n", filename, strerror(errno));
-        return 0;
-    }
-
-    fseek(stream, 0, SEEK_END);
-    size = (size_t)ftell(stream);
-    fseek(stream, 0, SEEK_SET);
-    size -= (size_t)ftell(stream);
-
-    data = (char*)malloc(size);
-    if(data)
-    {
-        if(size == fread(data, 1, size, stream))
-        {
-            *buffer = data;
-            *len = size;
-        }
-        else
-        {
-            fprintf(stderr, "read error from %s : %s\n", filename, strerror(errno));
-            free(data);
-        }
-    }
-    else
-    {
-        fprintf(stderr, "allocation error : %s\n", strerror(errno));
-    }
-    fclose(stream);
-    return *buffer ? 1 : 0;
-}
-/**
- * Convert embedded image to FITS.
- * @param [in] filename Output filename.
- * @param [in] buffer   PDS buffer.
- * @param [in] size     PDS buffer size.
- * @param [in] payload  PDS payload.
- * @return 1 upon success, 0 otherwise.
- */
-int write_image(const char *filename, char *buffer, size_t size, PDS_payload *payload)
-{
-    size_t bytes_per_sample = payload->image.sample_bits / 8;
-    size_t element_count = payload->image.lines * payload->image.samples_per_line;
-    size_t byte_count = element_count * bytes_per_sample;
-    size_t offset = (payload->image_record-1) * payload->record_size;
-    if((offset + byte_count) > size)
-    {
-        return 0;
-    }
-   
-    fitsfile *fptr; 
-    int status = 0;
-    long axis_count[] = { payload->image.samples_per_line, payload->image.lines };
-   
-    int bitpix, datatype;
-    switch(payload->image.sample_type)
-    {
-        case PDS_SAMPLE_UINT_LSB:
-            switch(payload->image.sample_bits)
-            {
-                case 8:
-                    bitpix   = BYTE_IMG;
-                    datatype = TBYTE;
-                    break;
-                case 16:
-                    bitpix   = USHORT_IMG;
-                    datatype = TUSHORT;
-                    break;
-                case 32:
-                    bitpix   = ULONG_IMG;
-                    datatype = TUINT;
-                    break;
-                default:
-                    fprintf(stderr, "Invalid type (uint)\n");
-                    return 0;
-            }
-            break;
-        case PDS_SAMPLE_FLOAT:       
-            switch(payload->image.sample_bits)
-            {
-                // [todo] 16bit float => pfm or OpenEXR
-                case 32:
-                    bitpix   = FLOAT_IMG;
-                    datatype = TFLOAT;
-                    break;
-                case 64:
-                    bitpix   = DOUBLE_IMG;
-                    datatype = TDOUBLE;
-                    break;
-                default:
-                    fprintf(stderr, "Invalid type (float)\n");
-                    return 0;
-            }
-            break;
-        default:
-            fprintf(stderr, "Invalid type\n");
-            return 0;
-    }
-    
-    fits_create_file(&fptr, filename, &status); 
-    fits_create_img(fptr, bitpix, 2, axis_count, &status);
-    fits_write_img(fptr, datatype, payload->image.bands, element_count, buffer+offset, &status);
-    fits_close_file(fptr, &status);
-    fits_report_error(stderr, status);
-    
-    return status ? 0 : 1;
-}
 /*
  * Main entry point.
  */
@@ -662,13 +481,15 @@ int main(int argc, char **argv)
 
     int ret;
 
-    if(3 != argc)
+    if(4 != argc)
     {
         usage();
         return EXIT_FAILURE;
     }
 
-    if(!buffer_from_file(argv[1], &buffer, &size))
+	g_image_string = argv[1];
+
+    if(!buffer_from_file(argv[2], &buffer, &size))
     {
         return EXIT_FAILURE;
     }
@@ -687,7 +508,7 @@ int main(int argc, char **argv)
     ret = PDS_parse(&callbacks, buffer, (int)size, &payload);
     if(ret)
     {
-        ret = write_image(argv[2], buffer, size, &payload);
+        ret = write_image(argv[3], buffer, size, (payload.image_record-1) * payload.record_size, &payload.image);
     }
 
     free(buffer);