From fc268dff901855a27b7ebc3c1969e6c34c6c5694 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Fri, 20 Jan 2012 11:20:51 +0000
Subject: [PATCH] remove warnings about const string

---
 NEWS                                          | 3 ++-
 applications/OPJViewer/source/icon1.xpm       | 2 +-
 applications/OPJViewer/source/icon2.xpm       | 2 +-
 applications/OPJViewer/source/icon3.xpm       | 2 +-
 applications/OPJViewer/source/icon4.xpm       | 2 +-
 applications/OPJViewer/source/icon5.xpm       | 2 +-
 applications/OPJViewer/source/wxj2kparser.cpp | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index e774c75b..3cd9071c 100644
--- 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 fbc605b5..69131fb5 100644
--- 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 7ae8c92c..cb8f1032 100644
--- 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 722de6b1..ddfa18b9 100644
--- 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 a18e1a70..37f95798 100644
--- 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 9f63c310..d4e8b118 100644
--- 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 600fd65e..eb48abeb 100644
--- a/applications/OPJViewer/source/wxj2kparser.cpp
+++ b/applications/OPJViewer/source/wxj2kparser.cpp
@@ -93,7 +93,7 @@ unsigned short int marker_val[] = {
 };
 
 // Marker names
-char *marker_name[] = {
+static const char *marker_name[] = {
 	"SOC", "SOT", "SOD", "EOC",
 	"SIZ",
 	"COD", "COC", "RGN", "QCD", "QCC", "POD",
@@ -109,7 +109,7 @@ char *marker_name[] = {
 };
 
 // Marker descriptions
-char *marker_descr[] = {
+static const char *marker_descr[] = {
 	"Start of codestream", "Start of tile-part", "Start of data", "End of codestream",
 	"Image and tile size",
 	"Coding style default", "Coding style component", "Region-of-interest", "Quantization default",