@@ -716,17 +716,17 @@ namespace ojph {
716716 }
717717 com_len = swap_byte (com_len);
718718 file->seek (com_len - 2 , infile_base::OJPH_SEEK_CUR);
719- if (msg != NULL && msg_level != OJPH_MSG_LEVEL::NO_MSG )
719+ if (msg != NULL && msg_level != OJPH_MSG_NO_MSG )
720720 {
721- if (msg_level == OJPH_MSG_LEVEL::INFO )
721+ if (msg_level == OJPH_MSG_INFO )
722722 {
723723 OJPH_INFO (0x00030001 , " %s"
724724 }
725- else if (msg_level == OJPH_MSG_LEVEL::WARN )
725+ else if (msg_level == OJPH_MSG_WARN )
726726 {
727727 OJPH_WARN (0x00030001 , " %s"
728728 }
729- else if (msg_level == OJPH_MSG_LEVEL::ERROR )
729+ else if (msg_level == OJPH_MSG_ERROR )
730730 {
731731 OJPH_ERROR (0x00030001 , " %s"
732732 }
@@ -753,10 +753,10 @@ namespace ojph {
753753 cap.read (file);
754754 else if (marker_idx == 1 )
755755 // Skipping PRF marker segment; this should not cause any issues
756- skip_marker (file, " PRF" NULL , OJPH_MSG_LEVEL::NO_MSG , false );
756+ skip_marker (file, " PRF" NULL , OJPH_MSG_NO_MSG , false );
757757 else if (marker_idx == 2 )
758758 // Skipping CPF marker segment; this should not cause any issues
759- skip_marker (file, " CPF" NULL , OJPH_MSG_LEVEL::NO_MSG , false );
759+ skip_marker (file, " CPF" NULL , OJPH_MSG_NO_MSG , false );
760760 else if (marker_idx == 3 )
761761 {
762762 cod.read (file);
@@ -803,29 +803,29 @@ namespace ojph {
803803 }
804804 else if (marker_idx == 7 )
805805 skip_marker (file, " RGN" " RGN is not supported yet"
806- OJPH_MSG_LEVEL::WARN , false );
806+ OJPH_MSG_WARN , false );
807807 else if (marker_idx == 8 )
808808 skip_marker (file, " POC" " POC is not supported yet"
809- OJPH_MSG_LEVEL::WARN , false );
809+ OJPH_MSG_WARN , false );
810810 else if (marker_idx == 9 )
811811 skip_marker (file, " PPM" " PPM is not supported yet"
812- OJPH_MSG_LEVEL::WARN , false );
812+ OJPH_MSG_WARN , false );
813813 else if (marker_idx == 10 )
814814 // Skipping TLM marker segment; this should not cause any issues
815- skip_marker (file, " TLM" NULL , OJPH_MSG_LEVEL::NO_MSG , false );
815+ skip_marker (file, " TLM" NULL , OJPH_MSG_NO_MSG , false );
816816 else if (marker_idx == 11 )
817817 // Skipping PLM marker segment; this should not cause any issues
818- skip_marker (file, " PLM" NULL , OJPH_MSG_LEVEL::NO_MSG , false );
818+ skip_marker (file, " PLM" NULL , OJPH_MSG_NO_MSG , false );
819819 else if (marker_idx == 12 )
820820 // Skipping CRG marker segment;
821821 skip_marker (file, " CRG" " CRG has been ignored; CRG is related to"
822822 " where the Cb and Cr colour components are co-sited or located"
823823 " with respect to the Y' luma component. Perhaps, it is better"
824824 " to get the individual components and assemble the samples"
825825 " according to your needs"
826- OJPH_MSG_LEVEL::INFO , false );
826+ OJPH_MSG_INFO , false );
827827 else if (marker_idx == 13 )
828- skip_marker (file, " COM" NULL , OJPH_MSG_LEVEL::NO_MSG , false );
828+ skip_marker (file, " COM" NULL , OJPH_MSG_NO_MSG , false );
829829 else if (marker_idx == 14 )
830830 dfs.read (file);
831831 else if (marker_idx == 15 )
@@ -926,22 +926,22 @@ namespace ojph {
926926 if (marker_idx == 0 )
927927 result = skip_marker (infile, " POC"
928928 " POC marker segment in a tile is not supported yet"
929- OJPH_MSG_LEVEL::WARN , resilient);
929+ OJPH_MSG_WARN , resilient);
930930 else if (marker_idx == 1 )
931931 result = skip_marker (infile, " PPT"
932932 " PPT marker segment in a tile is not supported yet"
933- OJPH_MSG_LEVEL::WARN , resilient);
933+ OJPH_MSG_WARN , resilient);
934934 else if (marker_idx == 2 )
935935 // Skipping PLT marker segment;this should not cause any issues
936936 result = skip_marker (infile, " PLT" NULL ,
937- OJPH_MSG_LEVEL::NO_MSG , resilient);
937+ OJPH_MSG_NO_MSG , resilient);
938938 else if (marker_idx == 3 )
939939 result = skip_marker (infile, " COM" NULL ,
940- OJPH_MSG_LEVEL::NO_MSG , resilient);
940+ OJPH_MSG_NO_MSG , resilient);
941941 else if (marker_idx == 4 )
942942 result = skip_marker (infile, " NLT"
943943 " NLT marker in tile is not supported yet"
944- OJPH_MSG_LEVEL::WARN , resilient);
944+ OJPH_MSG_WARN , resilient);
945945 else if (marker_idx == 5 )
946946 {
947947 sod_found = true ;
@@ -990,42 +990,42 @@ namespace ojph {
990990 if (marker_idx == 0 )
991991 result = skip_marker (infile, " COD"
992992 " COD marker segment in a tile is not supported yet"
993- OJPH_MSG_LEVEL::WARN , resilient);
993+ OJPH_MSG_WARN , resilient);
994994 else if (marker_idx == 1 )
995995 result = skip_marker (infile, " COC"
996996 " COC marker segment in a tile is not supported yet"
997- OJPH_MSG_LEVEL::WARN , resilient);
997+ OJPH_MSG_WARN , resilient);
998998 else if (marker_idx == 2 )
999999 result = skip_marker (infile, " QCD"
10001000 " QCD marker segment in a tile is not supported yet"
1001- OJPH_MSG_LEVEL::WARN , resilient);
1001+ OJPH_MSG_WARN , resilient);
10021002 else if (marker_idx == 3 )
10031003 result = skip_marker (infile, " QCC"
10041004 " QCC marker segment in a tile is not supported yet"
1005- OJPH_MSG_LEVEL::WARN , resilient);
1005+ OJPH_MSG_WARN , resilient);
10061006 else if (marker_idx == 4 )
10071007 result = skip_marker (infile, " RGN"
10081008 " RGN marker segment in a tile is not supported yet"
1009- OJPH_MSG_LEVEL::WARN , resilient);
1009+ OJPH_MSG_WARN , resilient);
10101010 else if (marker_idx == 5 )
10111011 result = skip_marker (infile, " POC"
10121012 " POC marker segment in a tile is not supported yet"
1013- OJPH_MSG_LEVEL::WARN , resilient);
1013+ OJPH_MSG_WARN , resilient);
10141014 else if (marker_idx == 6 )
10151015 result = skip_marker (infile, " PPT"
10161016 " PPT marker segment in a tile is not supported yet"
1017- OJPH_MSG_LEVEL::WARN , resilient);
1017+ OJPH_MSG_WARN , resilient);
10181018 else if (marker_idx == 7 )
10191019 // Skipping PLT marker segment;this should not cause any issues
10201020 result = skip_marker (infile, " PLT" NULL ,
1021- OJPH_MSG_LEVEL::NO_MSG , resilient);
1021+ OJPH_MSG_NO_MSG , resilient);
10221022 else if (marker_idx == 8 )
10231023 result = skip_marker (infile, " COM" NULL ,
1024- OJPH_MSG_LEVEL::NO_MSG , resilient);
1024+ OJPH_MSG_NO_MSG , resilient);
10251025 else if (marker_idx == 9 )
10261026 result = skip_marker (infile, " NLT"
10271027 " PPT marker segment in a tile is not supported yet"
1028- OJPH_MSG_LEVEL::WARN , resilient);
1028+ OJPH_MSG_WARN , resilient);
10291029 else if (marker_idx == 10 )
10301030 {
10311031 sod_found = true ;
0 commit comments