remove warnings about const string

diff --git a/NEWS b/NEWS
index e774c75b612eae60fb023c4ef82d56f5a54b73ab..3cd9071c0db7fa884f51f8491b4220a216203dc9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,4 +30,5 @@ Misc:
      - results are submitted to the OpenJPEG dashboard (http://my.cdash.org/index.php?project=OPENJPEG)
      - images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
      - configuration files and utilities are located in 'tests' folder.
-    * Many bug fixes. See CHANGES for details.
\ No newline at end of file
+    * OPJViewer re-activated (need wxWidgets)
+    * Many bug fixes. See CHANGES for details.

diff --git a/applications/OPJViewer/source/icon1.xpm b/applications/OPJViewer/source/icon1.xpm
index fbc605b5fd431fb3c3b26130fab64e7e2fd72344..69131fb534dbbdfe66f50ad21a7f5363a957afcd 100644 (file)
--- a/applications/OPJViewer/source/icon1.xpm
+++ b/applications/OPJViewer/source/icon1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon1_xpm[] = {
+static const char *icon1_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "> c #97C4E7",

diff --git a/applications/OPJViewer/source/icon2.xpm b/applications/OPJViewer/source/icon2.xpm
index 7ae8c92cd7292ce286b0cce1ea780fc956eb76f1..cb8f103213e2737a9a41b1c7e960ec00f8ec1cf1 100644 (file)
--- a/applications/OPJViewer/source/icon2.xpm
+++ b/applications/OPJViewer/source/icon2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon2_xpm[] = {
+static const char *icon2_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 15 1",
 ". c Black",

diff --git a/applications/OPJViewer/source/icon3.xpm b/applications/OPJViewer/source/icon3.xpm
index 722de6b1c121e03f29256abc961ddfe90d5893ff..ddfa18b9dcc91be33ba49de1e271c285f44e2cb6 100644 (file)
--- a/applications/OPJViewer/source/icon3.xpm
+++ b/applications/OPJViewer/source/icon3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon3_xpm[] = {
+static const char *icon3_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "6 c #EDF2FB",

diff --git a/applications/OPJViewer/source/icon4.xpm b/applications/OPJViewer/source/icon4.xpm
index a18e1a70ea903ea92a00232a946063297c54afdf..37f95798dfa5106518659cf8cfb2ae2d2111a7d1 100644 (file)
--- a/applications/OPJViewer/source/icon4.xpm
+++ b/applications/OPJViewer/source/icon4.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon4_xpm[] = {
+static const char *icon4_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 5 1",
 ". c Black",

diff --git a/applications/OPJViewer/source/icon5.xpm b/applications/OPJViewer/source/icon5.xpm
index 9f63c310989f54da3b727fe278e9287a0ffafd66..d4e8b118219a80b7dae9a51a4dff7bbe696336f3 100644 (file)
--- a/applications/OPJViewer/source/icon5.xpm
+++ b/applications/OPJViewer/source/icon5.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon5_xpm[] = {
+static const char *icon5_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "0 c #AAC1E8",

diff --git a/applications/OPJViewer/source/wxj2kparser.cpp b/applications/OPJViewer/source/wxj2kparser.cpp
index 600fd65e2212ce1a80c7b9fe12275b6bc7d559c0..eb48abeb9b6c222666c477af3f6658081c1eba0b 100644 (file)
--- a/applications/OPJViewer/source/wxj2kparser.cpp
+++ b/applications/OPJViewer/source/wxj2kparser.cpp
@@ -93,7 +93,7 @@ unsigned short int marker_val[] = {
 };\r
 \r
 // Marker names\r
-char *marker_name[] = {\r
+static const char *marker_name[] = {\r
        "SOC", "SOT", "SOD", "EOC",\r
        "SIZ",\r
        "COD", "COC", "RGN", "QCD", "QCC", "POD",\r
@@ -109,7 +109,7 @@ char *marker_name[] = {
 };\r
 \r
 // Marker descriptions\r
-char *marker_descr[] = {\r
+static const char *marker_descr[] = {\r
        "Start of codestream", "Start of tile-part", "Start of data", "End of codestream",\r
        "Image and tile size",\r
        "Coding style default", "Coding style component", "Region-of-interest", "Quantization default",\r