Implemented J2K desc to/from MD

[asdcplib.git] / src / as-02-wrap.cpp

diff --git a/src/as-02-wrap.cpp b/src/as-02-wrap.cpp
index ce291f68a3a334edb755f102cde2bf737fe62f08..a4984741a5d7345a57f955d1fa1a77c5b7a2b9b1 100755 (executable)
--- a/src/as-02-wrap.cpp
+++ b/src/as-02-wrap.cpp
@@ -176,8 +176,8 @@ Options:\n\
   -t <min>          - Set RGB component minimum code value (default: 0)\n\
   -T <max>          - Set RGB component maximum code value (default: 1023)\n\
   -u                - Print UL catalog to stdout\n\
-  -u <URI>          - ISXD (RDD47) document URI (use 'auto' to read the\n\
-                      namespace name from the first edit unit\n\
+  -U <URI>          - ISXD (RDD47) document URI (use 'auto' to read the\n\
+                      namespace name from the first edit unit)\n\
   -v                - Verbose, prints informative messages to stderr\n\
   -W                - Read input file only, do not write source file\n\
   -x <int>          - Horizontal subsampling degree (default: 2)\n\
@@ -202,12 +202,12 @@ Options specific to ACES ST2067-50:\n\
                       uses values from -o and -O, if present\n\
   -subt <directoryPath>  - \n\
                       Create one Target Frame SubDescriptor per PNG or TIFF file in <directoryPath>,\n\
-                      and  wrap each PNG or TIFF file  as ancillariy resource\n\
+                      and  wrap each PNG or TIFF file  as ancillary resource\n\
                       Requires additional options -tfi, -tft, -tfc, -tfr\n\
   -tfi <int>[,<int>*]    - \n\
                       List of TargetFrameIndex values in Target Frame SubDescriptor corresponding to the \n\
                       list of Target Frame frame files in <directoryPath> as given by option -subt\n\
-  -tft <string>     - Target Frame Transfer Characteristics Symbol, e.g. TransferCharacteristics_709\n\
+  -tft <string>     - Target Frame Transfer Characteristics Symbol, e.g. TransferCharacteristic_ITU709\n\
   -tfc <string>     - Target Frame Color Primaries Symbol, e.g. ColorPrimaries_ITU709\n\
   -tfr <min>,<max>  - Target Frame Component Min/Max Ref in Target Frame SubDescriptor\n\
   -tfv <string>     - Target Frame Viewing Environment Symbol, e.g. HDTVReferenceViewingEnvironment\n\
@@ -473,12 +473,12 @@ public:
     std::list<std::string> range_tokens = Kumu::km_token_split(arg, ",");
     if ( range_tokens.size() != 2 )
       {
-       fprintf(stderr, "Expecting a luminance pair.\n");
+       fprintf(stderr, "Expecting a code value pair.\n");
        return false;
       }
 
-    if ( ! set_luminance_from_token(range_tokens.front(), target_frame_min_ref) ) return false;
-    if ( ! set_luminance_from_token(range_tokens.back(), target_frame_max_ref) ) return false;
+    target_frame_min_ref = strtol(range_tokens.front().c_str(), 0 , 10);
+    target_frame_max_ref = strtol(range_tokens.back().c_str(), 0 , 10);
 
     return true;
   }