processed all c/h files through astyle with opj_astyle.cfgcodingstyle

5 files changed, 457 insertions, 424 deletions

diff --git a/src/bin/wx/OPJViewer/source/OPJViewer.h b/src/bin/wx/OPJViewer/source/OPJViewer.h
index 0d49468a..ed081888 100644
--- a/src/bin/wx/OPJViewer/source/OPJViewer.h
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.h
@@ -1,6 +1,6 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
@@ -180,73 +180,83 @@ class OPJChildFrame;
 //////////////////////////////////
 class OPJViewerApp: public wxApp
 {
-	// public methods and variables
-	public:
-
-		// class constructor
-		OPJViewerApp() { m_showImages = true; m_showButtons = false; }
+    // public methods and variables
+public:
 
-		// other methods
-		bool OnInit(void);
-		int OnExit(void);
-		void SetShowImages(bool show) { m_showImages = show; }
-		bool ShowImages() const { return m_showImages; }
-		void ShowCmdLine(const wxCmdLineParser& parser);
+    // class constructor
+    OPJViewerApp()
+    {
+        m_showImages = true;
+        m_showButtons = false;
+    }
+
+    // other methods
+    bool OnInit(void);
+    int OnExit(void);
+    void SetShowImages(bool show)
+    {
+        m_showImages = show;
+    }
+    bool ShowImages() const
+    {
+        return m_showImages;
+    }
+    void ShowCmdLine(const wxCmdLineParser& parser);
 
-		// all the threads currently alive - as soon as the thread terminates, it's
-		// removed from the array
-		wxArrayThread m_deco_threads, m_parse_threads, m_enco_threads;
+    // all the threads currently alive - as soon as the thread terminates, it's
+    // removed from the array
+    wxArrayThread m_deco_threads, m_parse_threads, m_enco_threads;
 
-		// crit section protects access to all of the arrays below
-		wxCriticalSection m_deco_critsect, m_parse_critsect, m_enco_critsect;
+    // crit section protects access to all of the arrays below
+    wxCriticalSection m_deco_critsect, m_parse_critsect, m_enco_critsect;
 
-		// semaphore used to wait for the threads to exit, see OPJFrame::OnQuit()
-		wxSemaphore m_deco_semAllDone, m_parse_semAllDone, m_enco_semAllDone;
+    // semaphore used to wait for the threads to exit, see OPJFrame::OnQuit()
+    wxSemaphore m_deco_semAllDone, m_parse_semAllDone, m_enco_semAllDone;
 
-		// the last exiting thread should post to m_semAllDone if this is true
-		// (protected by the same m_critsect)
-		bool m_deco_waitingUntilAllDone, m_parse_waitingUntilAllDone, m_enco_waitingUntilAllDone;
+    // the last exiting thread should post to m_semAllDone if this is true
+    // (protected by the same m_critsect)
+    bool m_deco_waitingUntilAllDone, m_parse_waitingUntilAllDone, m_enco_waitingUntilAllDone;
 
-		// the list of all filenames written in the command line
-		wxArrayString m_filelist;
+    // the list of all filenames written in the command line
+    wxArrayString m_filelist;
 
-		// displaying engine parameters
-		int m_resizemethod;
+    // displaying engine parameters
+    int m_resizemethod;
 
-		// decoding engine parameters
-		bool m_enabledeco, m_enableparse;
-		int m_reducefactor, m_qualitylayers, m_components, m_framenum;
+    // decoding engine parameters
+    bool m_enabledeco, m_enableparse;
+    int m_reducefactor, m_qualitylayers, m_components, m_framenum;
 #ifdef USE_JPWL
-		bool m_enablejpwl, m_enablejpwle;
-		int m_expcomps, m_maxtiles;
+    bool m_enablejpwl, m_enablejpwle;
+    int m_expcomps, m_maxtiles;
 #endif // USE_JPWL
-		int m_framewidth, m_frameheight;
-
-		// encoding engine parameters
-		wxString m_subsampling, m_origin, m_rates, m_comment, m_index, m_quality;
-		wxString m_cbsize, m_prsize, m_tsize, m_torigin, m_poc;
-		bool m_enablecomm, m_enableidx, m_multicomp, m_irreversible, m_enablesop, m_enableeph;
-		bool m_enablebypass, m_enablereset, m_enablerestart, m_enablevsc, m_enableerterm;
-		bool m_enablesegmark, m_enablepoc;
-		bool m_enablequality;
-		int m_resolutions, m_progression;
+    int m_framewidth, m_frameheight;
+
+    // encoding engine parameters
+    wxString m_subsampling, m_origin, m_rates, m_comment, m_index, m_quality;
+    wxString m_cbsize, m_prsize, m_tsize, m_torigin, m_poc;
+    bool m_enablecomm, m_enableidx, m_multicomp, m_irreversible, m_enablesop, m_enableeph;
+    bool m_enablebypass, m_enablereset, m_enablerestart, m_enablevsc, m_enableerterm;
+    bool m_enablesegmark, m_enablepoc;
+    bool m_enablequality;
+    int m_resolutions, m_progression;
 #ifdef USE_JPWL
-		int m_hprotsel[MYJPWL_MAX_NO_TILESPECS], m_pprotsel[MYJPWL_MAX_NO_TILESPECS];
-		int m_htileval[MYJPWL_MAX_NO_TILESPECS], m_ptileval[MYJPWL_MAX_NO_TILESPECS],
-			m_ppackval[MYJPWL_MAX_NO_TILESPECS];
-		int m_sensisel[MYJPWL_MAX_NO_TILESPECS], m_stileval[MYJPWL_MAX_NO_TILESPECS];
+    int m_hprotsel[MYJPWL_MAX_NO_TILESPECS], m_pprotsel[MYJPWL_MAX_NO_TILESPECS];
+    int m_htileval[MYJPWL_MAX_NO_TILESPECS], m_ptileval[MYJPWL_MAX_NO_TILESPECS],
+        m_ppackval[MYJPWL_MAX_NO_TILESPECS];
+    int m_sensisel[MYJPWL_MAX_NO_TILESPECS], m_stileval[MYJPWL_MAX_NO_TILESPECS];
 #endif // USE_JPWL
 
-		// some layout settings
-		bool m_showtoolbar, m_showbrowser, m_showpeeker;
-		int m_browserwidth, m_peekerheight;
+    // some layout settings
+    bool m_showtoolbar, m_showbrowser, m_showpeeker;
+    int m_browserwidth, m_peekerheight;
 
-		// application configuration
-		wxConfig *OPJconfig; 
+    // application configuration
+    wxConfig *OPJconfig;
 
-	// private methods and variables
-	private:
-		bool m_showImages, m_showButtons;
+    // private methods and variables
+private:
+    bool m_showImages, m_showButtons;
 
 };
 
@@ -257,37 +267,38 @@ DECLARE_APP(OPJViewerApp)
 ///////////////////////////////////////////
 class OPJCanvas: public wxScrolledWindow
 {
-	// public methods and variables
-	public:
+    // public methods and variables
+public:
 
-		// class constructor
-		OPJCanvas(wxFileName fname, wxWindow *parent, const wxPoint& pos, const wxSize& size);
+    // class constructor
+    OPJCanvas(wxFileName fname, wxWindow *parent, const wxPoint& pos, const wxSize& size);
 
-		virtual void OnDraw(wxDC& dc);
-		void OnEvent(wxMouseEvent& event);
-		void WriteText(const wxString& text) {
-#ifndef __WXGTK__ 
-			wxMutexGuiEnter();
+    virtual void OnDraw(wxDC& dc);
+    void OnEvent(wxMouseEvent& event);
+    void WriteText(const wxString& text)
+    {
+#ifndef __WXGTK__
+        wxMutexGuiEnter();
 #endif //__WXGTK__
-			wxLogMessage(text);
-#ifndef __WXGTK__ 
-			wxMutexGuiLeave();
+        wxLogMessage(text);
+#ifndef __WXGTK__
+        wxMutexGuiLeave();
 #endif //__WXGTK__
-		}
+    }
 
-		void OnThreadSignal(wxCommandEvent& event);
+    void OnThreadSignal(wxCommandEvent& event);
 
-		OPJDecoThread *CreateDecoThread(void);
-		OPJEncoThread *CreateEncoThread(void);
+    OPJDecoThread *CreateDecoThread(void);
+    OPJEncoThread *CreateEncoThread(void);
 
 
-		OPJChildFrame *m_childframe;
+    OPJChildFrame *m_childframe;
 
-		wxBitmap  m_image, m_image100;
-		wxFileName m_fname, m_savename;
-		long m_zooml;
+    wxBitmap  m_image, m_image100;
+    wxFileName m_fname, m_savename;
+    long m_zooml;
 
-	DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 ///////////////////////////////////////////////////
@@ -295,29 +306,38 @@ class OPJCanvas: public wxScrolledWindow
 ///////////////////////////////////////////////////
 class OPJMarkerData : public wxTreeItemData
 {
-	// public methods and variables
-	public:
+    // public methods and variables
+public:
 
-		// class constructor
-		OPJMarkerData(const wxString& desc, const wxString& fname = wxT(""), wxFileOffset start = 0, wxFileOffset length = 0) : m_desc(desc), m_filestring(fname) { m_start = start; m_length = length; }
+    // class constructor
+    OPJMarkerData(const wxString& desc, const wxString& fname = wxT(""), wxFileOffset start = 0, wxFileOffset length = 0) : m_desc(desc), m_filestring(fname)
+    {
+        m_start = start;
+        m_length = length;
+    }
 
-		void ShowInfo(wxTreeCtrl *tree);
-		const wxChar *GetDesc1() const { return m_desc.c_str(); }
-		const wxChar *GetDesc2() const { return m_filestring.c_str(); }
-		wxFileOffset m_start, m_length;
-		wxString m_desc;
+    void ShowInfo(wxTreeCtrl *tree);
+    const wxChar *GetDesc1() const
+    {
+        return m_desc.c_str();
+    }
+    const wxChar *GetDesc2() const
+    {
+        return m_filestring.c_str();
+    }
+    wxFileOffset m_start, m_length;
+    wxString m_desc;
 
-	// private methods and variables
-	private:
-		wxString m_filestring;
+    // private methods and variables
+private:
+    wxString m_filestring;
 };
 
 
 class OPJMarkerTree : public wxTreeCtrl
 {
 public:
-    enum
-    {
+    enum {
         TreeCtrlIcon_File,
         TreeCtrlIcon_FileSelected,
         TreeCtrlIcon_Folder,
@@ -327,15 +347,20 @@ public:
 
     OPJMarkerTree() { };
     OPJMarkerTree(wxWindow *parent, OPJChildFrame *subframe, wxFileName fname, wxString name, const wxWindowID id,
-               const wxPoint& pos, const wxSize& size,
-               long style);
-    virtual ~OPJMarkerTree(){};
-	OPJParseThread *CreateParseThread(wxTreeItemId parentid = 0x00, OPJChildFrame *subframe = NULL);
-    void WriteText(const wxString& text) { wxMutexGuiEnter(); wxLogMessage(text); wxMutexGuiLeave(); }
+                  const wxPoint& pos, const wxSize& size,
+                  long style);
+    virtual ~OPJMarkerTree() {};
+    OPJParseThread *CreateParseThread(wxTreeItemId parentid = 0x00, OPJChildFrame *subframe = NULL);
+    void WriteText(const wxString& text)
+    {
+        wxMutexGuiEnter();
+        wxLogMessage(text);
+        wxMutexGuiLeave();
+    }
 
-	wxFileName m_fname;
-	wxTextCtrl *m_peektextCtrl;
-	OPJChildFrame *m_childframe;
+    wxFileName m_fname;
+    wxTextCtrl *m_peektextCtrl;
+    OPJChildFrame *m_childframe;
 
     /*void OnBeginDrag(wxTreeEvent& event);
     void OnBeginRDrag(wxTreeEvent& event);
@@ -372,9 +397,15 @@ public:
     /*void DoToggleIcon(const wxTreeItemId& item);*/
     /*void ShowMenu(wxTreeItemId id, const wxPoint& pt);*/
 
-    int ImageSize(void) const { return m_imageSize; }
+    int ImageSize(void) const
+    {
+        return m_imageSize;
+    }
 
-    void SetLastItem(wxTreeItemId id) { m_lastItem = id; }
+    void SetLastItem(wxTreeItemId id)
+    {
+        m_lastItem = id;
+    }
 
 protected:
     /*virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);*/
@@ -416,12 +447,12 @@ WX_DECLARE_HASH_MAP(int, OPJChildFrame*, wxIntegerHash, wxIntegerEqual, OPJChild
 // Define a new frame
 class OPJFrame: public wxMDIParentFrame
 {
-  public:
+public:
 
     OPJFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
 
     ~OPJFrame(void);
-	void OnSize(wxSizeEvent& WXUNUSED(event));
+    void OnSize(wxSizeEvent& WXUNUSED(event));
     void OnAbout(wxCommandEvent& WXUNUSED(event));
     void OnFileOpen(wxCommandEvent& WXUNUSED(event));
     void OnFileSaveAs(wxCommandEvent& WXUNUSED(event));
@@ -429,43 +460,43 @@ class OPJFrame: public wxMDIParentFrame
     void OnQuit(wxCommandEvent& WXUNUSED(event));
     void OnClose(wxCommandEvent& WXUNUSED(event));
     void OnZoom(wxCommandEvent& WXUNUSED(event));
-	void OnFit(wxCommandEvent& event);
-	void OnToggleBrowser(wxCommandEvent& WXUNUSED(event));
-	void OnTogglePeeker(wxCommandEvent& WXUNUSED(event));
-	void OnToggleToolbar(wxCommandEvent& WXUNUSED(event));
-	void OnReload(wxCommandEvent& event);
-	void OnPrevFrame(wxCommandEvent& event);
-	void OnHomeFrame(wxCommandEvent& event);
-	void OnNextFrame(wxCommandEvent& event);
-	void OnLessLayers(wxCommandEvent& event);
-	void OnAllLayers(wxCommandEvent& event);
-	void OnMoreLayers(wxCommandEvent& event);
-	void OnLessRes(wxCommandEvent& event);
-	void OnFullRes(wxCommandEvent& event);
-	void OnMoreRes(wxCommandEvent& event);
-	void OnPrevComp(wxCommandEvent& event);
-	void OnAllComps(wxCommandEvent& event);
-	void OnNextComp(wxCommandEvent& event);
-	void OnSetsEnco(wxCommandEvent& event);
-	void OnSetsDeco(wxCommandEvent& event);
-	void OnSashDrag(wxSashEvent& event);
-	void OpenFiles(wxArrayString paths, wxArrayString filenames);
-	void SaveFile(wxArrayString paths, wxArrayString filenames);
-	void OnNotebook(wxNotebookEvent& event);
-	void Rescale(int scale, OPJChildFrame *child);
-	void OnThreadLogmsg(wxCommandEvent& event);
-
-	OPJMarkerTreeHash m_treehash;
-	OPJChildFrameHash m_childhash;
+    void OnFit(wxCommandEvent& event);
+    void OnToggleBrowser(wxCommandEvent& WXUNUSED(event));
+    void OnTogglePeeker(wxCommandEvent& WXUNUSED(event));
+    void OnToggleToolbar(wxCommandEvent& WXUNUSED(event));
+    void OnReload(wxCommandEvent& event);
+    void OnPrevFrame(wxCommandEvent& event);
+    void OnHomeFrame(wxCommandEvent& event);
+    void OnNextFrame(wxCommandEvent& event);
+    void OnLessLayers(wxCommandEvent& event);
+    void OnAllLayers(wxCommandEvent& event);
+    void OnMoreLayers(wxCommandEvent& event);
+    void OnLessRes(wxCommandEvent& event);
+    void OnFullRes(wxCommandEvent& event);
+    void OnMoreRes(wxCommandEvent& event);
+    void OnPrevComp(wxCommandEvent& event);
+    void OnAllComps(wxCommandEvent& event);
+    void OnNextComp(wxCommandEvent& event);
+    void OnSetsEnco(wxCommandEvent& event);
+    void OnSetsDeco(wxCommandEvent& event);
+    void OnSashDrag(wxSashEvent& event);
+    void OpenFiles(wxArrayString paths, wxArrayString filenames);
+    void SaveFile(wxArrayString paths, wxArrayString filenames);
+    void OnNotebook(wxNotebookEvent& event);
+    void Rescale(int scale, OPJChildFrame *child);
+    void OnThreadLogmsg(wxCommandEvent& event);
+
+    OPJMarkerTreeHash m_treehash;
+    OPJChildFrameHash m_childhash;
     wxSashLayoutWindow* markerTreeWindow;
     wxSashLayoutWindow* loggingWindow;
-	wxToolBar* tool_bar;
+    wxToolBar* tool_bar;
     void Resize(int number);
-	wxNotebook *m_bookCtrl;
-	wxNotebook *m_bookCtrlbottom;
+    wxNotebook *m_bookCtrl;
+    wxNotebook *m_bookCtrlbottom;
     wxTextCtrl *m_textCtrlbrowse;
 
-  private:
+private:
     void TogStyle(int id, long flag);
 
     void DoSort(bool reverse = false);
@@ -479,70 +510,69 @@ protected:
     wxSashLayoutWindow* m_topWindow;
     wxSashLayoutWindow* m_leftWindow2;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 class OPJChildFrame: public wxMDIChildFrame
 {
-  public:
+public:
     OPJCanvas *m_canvas;
     OPJChildFrame(OPJFrame *parent, wxFileName fname, int winnumber, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~OPJChildFrame(void);
     void OnActivate(wxActivateEvent& event);
-	/*void OnQuit(wxCommandEvent& WXUNUSED(event));*/
-	void OnClose(wxCloseEvent& event);
-	void OnGotFocus(wxFocusEvent& event);
-	void OnLostFocus(wxFocusEvent& event);
+    /*void OnQuit(wxCommandEvent& WXUNUSED(event));*/
+    void OnClose(wxCloseEvent& event);
+    void OnGotFocus(wxFocusEvent& event);
+    void OnLostFocus(wxFocusEvent& event);
     OPJFrame *m_frame;
-	wxFileName m_fname;
-	int m_winnumber;
+    wxFileName m_fname;
+    int m_winnumber;
 
-	unsigned long  m_twidth, m_theight, m_tx, m_ty;
+    unsigned long  m_twidth, m_theight, m_tx, m_ty;
 
-	DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 // frame and main menu ids
 enum {
-	OPJFRAME_FILEEXIT = wxID_EXIT,
-	OPJFRAME_HELPABOUT = wxID_ABOUT,
-	OPJFRAME_FILEOPEN,
-	OPJFRAME_MEMORYOPEN,
-	OPJFRAME_FILESAVEAS,
-	OPJFRAME_FILETOGGLEB,
-	OPJFRAME_FILETOGGLEP,
-	OPJFRAME_FILETOGGLET,
-	OPJFRAME_VIEWZOOM,
-	OPJFRAME_VIEWFIT,
-	OPJFRAME_VIEWRELOAD,
-	OPJFRAME_VIEWPREVFRAME,
-	OPJFRAME_VIEWHOMEFRAME,
-	OPJFRAME_VIEWNEXTFRAME,
-	OPJFRAME_VIEWLESSLAYERS,
-	OPJFRAME_VIEWALLLAYERS,
-	OPJFRAME_VIEWMORELAYERS,
-	OPJFRAME_VIEWLESSRES,
-	OPJFRAME_VIEWFULLRES,
-	OPJFRAME_VIEWMORERES,
-	OPJFRAME_VIEWPREVCOMP,
-	OPJFRAME_VIEWALLCOMPS,
-	OPJFRAME_VIEWNEXTCOMP,
-	OPJFRAME_FILECLOSE,
-	OPJFRAME_SETSENCO,
-	OPJFRAME_SETSDECO,
-
-	OPJFRAME_BROWSEWIN = 10000,
-	OPJFRAME_LOGWIN,
-	OPJFRAME_TOOLBAR,
-
-	OPJFRAME_THREADLOGMSG,
-	OPJCANVAS_THREADSIGNAL
+    OPJFRAME_FILEEXIT = wxID_EXIT,
+    OPJFRAME_HELPABOUT = wxID_ABOUT,
+    OPJFRAME_FILEOPEN,
+    OPJFRAME_MEMORYOPEN,
+    OPJFRAME_FILESAVEAS,
+    OPJFRAME_FILETOGGLEB,
+    OPJFRAME_FILETOGGLEP,
+    OPJFRAME_FILETOGGLET,
+    OPJFRAME_VIEWZOOM,
+    OPJFRAME_VIEWFIT,
+    OPJFRAME_VIEWRELOAD,
+    OPJFRAME_VIEWPREVFRAME,
+    OPJFRAME_VIEWHOMEFRAME,
+    OPJFRAME_VIEWNEXTFRAME,
+    OPJFRAME_VIEWLESSLAYERS,
+    OPJFRAME_VIEWALLLAYERS,
+    OPJFRAME_VIEWMORELAYERS,
+    OPJFRAME_VIEWLESSRES,
+    OPJFRAME_VIEWFULLRES,
+    OPJFRAME_VIEWMORERES,
+    OPJFRAME_VIEWPREVCOMP,
+    OPJFRAME_VIEWALLCOMPS,
+    OPJFRAME_VIEWNEXTCOMP,
+    OPJFRAME_FILECLOSE,
+    OPJFRAME_SETSENCO,
+    OPJFRAME_SETSDECO,
+
+    OPJFRAME_BROWSEWIN = 10000,
+    OPJFRAME_LOGWIN,
+    OPJFRAME_TOOLBAR,
+
+    OPJFRAME_THREADLOGMSG,
+    OPJCANVAS_THREADSIGNAL
 };
 
 
 // menu and control ids
-enum
-{
+enum {
     TreeTest_Quit = wxID_EXIT,
     TreeTest_About = wxID_ABOUT,
     TreeTest_TogButtons = wxID_HIGHEST,
@@ -587,8 +617,8 @@ enum
     TreeTest_Unselect,
     TreeTest_SelectRoot,
     TreeTest_Ctrl = 1000,
-	BOTTOM_NOTEBOOK_ID,
-	LEFT_NOTEBOOK_ID
+    BOTTOM_NOTEBOOK_ID,
+    LEFT_NOTEBOOK_ID
 };
 
 class OPJEncoThread : public wxThread
@@ -645,19 +675,19 @@ public:
 
     // write something to the text control
     void WriteText(const wxString& text);
-	void LoadFile(wxFileName fname);
-	void ParseJ2KFile(wxFile *m_file, wxFileOffset offset, wxFileOffset length, wxTreeItemId parentid);
-	void ParseJP2File(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit, wxTreeItemId parentid);
+    void LoadFile(wxFileName fname);
+    void ParseJ2KFile(wxFile *m_file, wxFileOffset offset, wxFileOffset length, wxTreeItemId parentid);
+    void ParseJP2File(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit, wxTreeItemId parentid);
 
     unsigned m_count;
     OPJMarkerTree *m_tree;
-	wxTreeItemId m_parentid;
+    wxTreeItemId m_parentid;
 
 private:
-	int jpeg2000parse(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
-			wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint);
-	int box_handler_function(int boxtype, wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
-			wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint);
+    int jpeg2000parse(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
+                      wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint);
+    int box_handler_function(int boxtype, wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
+                             wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint);
 
 };
 
@@ -666,7 +696,10 @@ private:
 class OPJDnDFile: public wxFileDropTarget
 {
 public:
-    OPJDnDFile(OPJFrame *pOwner) { m_pOwner = pOwner; }
+    OPJDnDFile(OPJFrame *pOwner)
+    {
+        m_pOwner = pOwner;
+    }
     virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
 
 private:
@@ -678,137 +711,137 @@ private:
 // Property sheet dialog: encoder
 class OPJEncoderDialog: public wxPropertySheetDialog
 {
-DECLARE_CLASS(OPJEncoderDialog)
+    DECLARE_CLASS(OPJEncoderDialog)
 public:
     OPJEncoderDialog(wxWindow* parent, int dialogType);
     ~OPJEncoderDialog();
 
-	wxBookCtrlBase* m_settingsNotebook;
+    wxBookCtrlBase* m_settingsNotebook;
 
     wxPanel* CreateMainSettingsPage(wxWindow* parent);
     wxPanel* CreatePart1_1SettingsPage(wxWindow* parent);
     wxPanel* CreatePart1_2SettingsPage(wxWindow* parent);
-/*    wxPanel* CreatePart3SettingsPage(wxWindow* parent);*/
-	void OnEnableComm(wxCommandEvent& event);
-	void OnEnableIdx(wxCommandEvent& event);
-	void OnEnablePoc(wxCommandEvent& event);
-	void OnRadioQualityRate(wxCommandEvent& event);
+    /*    wxPanel* CreatePart3SettingsPage(wxWindow* parent);*/
+    void OnEnableComm(wxCommandEvent& event);
+    void OnEnableIdx(wxCommandEvent& event);
+    void OnEnablePoc(wxCommandEvent& event);
+    void OnRadioQualityRate(wxCommandEvent& event);
 #ifdef USE_JPWL
-	void OnEnableJPWL(wxCommandEvent& event);
-	wxPanel* CreatePart11SettingsPage(wxWindow* parent);
-	/*wxCheckBox *m_enablejpwlCheck;*/
-	wxChoice *m_hprotChoice[MYJPWL_MAX_NO_TILESPECS];
-	wxSpinCtrl *m_htileCtrl[MYJPWL_MAX_NO_TILESPECS];
-	wxChoice *m_pprotChoice[MYJPWL_MAX_NO_TILESPECS];
-	wxSpinCtrl *m_ptileCtrl[MYJPWL_MAX_NO_TILESPECS];
-	wxSpinCtrl *m_ppackCtrl[MYJPWL_MAX_NO_TILESPECS];
-	wxChoice *m_sensiChoice[MYJPWL_MAX_NO_TILESPECS];
-	wxSpinCtrl *m_stileCtrl[MYJPWL_MAX_NO_TILESPECS];
-	void OnHprotSelect(wxCommandEvent& event);
-	void OnPprotSelect(wxCommandEvent& event);
-	void OnSensiSelect(wxCommandEvent& event);
+    void OnEnableJPWL(wxCommandEvent& event);
+    wxPanel* CreatePart11SettingsPage(wxWindow* parent);
+    /*wxCheckBox *m_enablejpwlCheck;*/
+    wxChoice *m_hprotChoice[MYJPWL_MAX_NO_TILESPECS];
+    wxSpinCtrl *m_htileCtrl[MYJPWL_MAX_NO_TILESPECS];
+    wxChoice *m_pprotChoice[MYJPWL_MAX_NO_TILESPECS];
+    wxSpinCtrl *m_ptileCtrl[MYJPWL_MAX_NO_TILESPECS];
+    wxSpinCtrl *m_ppackCtrl[MYJPWL_MAX_NO_TILESPECS];
+    wxChoice *m_sensiChoice[MYJPWL_MAX_NO_TILESPECS];
+    wxSpinCtrl *m_stileCtrl[MYJPWL_MAX_NO_TILESPECS];
+    void OnHprotSelect(wxCommandEvent& event);
+    void OnPprotSelect(wxCommandEvent& event);
+    void OnSensiSelect(wxCommandEvent& event);
 #endif // USE_JPWL
 
-	wxTextCtrl *m_subsamplingCtrl, *m_originCtrl, *m_rateCtrl, *m_commentCtrl;
-	wxRadioButton *m_rateRadio, *m_qualityRadio;
-	wxTextCtrl *m_indexCtrl, *m_qualityCtrl, *m_cbsizeCtrl, *m_prsizeCtrl, *m_pocCtrl;
-	wxTextCtrl *m_tsizeCtrl, *m_toriginCtrl;
-	wxRadioBox *progressionBox;
-	wxCheckBox *m_enablecommCheck, *m_enableidxCheck, *m_mctCheck, *m_irrevCheck;
-	wxCheckBox *m_sopCheck, *m_ephCheck, *m_enablebypassCheck, *m_enableresetCheck,
-		*m_enablerestartCheck, *m_enablevscCheck, *m_enableertermCheck, *m_enablesegmarkCheck;
-	wxCheckBox *m_enablepocCheck, *m_enablejpwlCheck;
-	wxSpinCtrl *m_resolutionsCtrl;
+    wxTextCtrl *m_subsamplingCtrl, *m_originCtrl, *m_rateCtrl, *m_commentCtrl;
+    wxRadioButton *m_rateRadio, *m_qualityRadio;
+    wxTextCtrl *m_indexCtrl, *m_qualityCtrl, *m_cbsizeCtrl, *m_prsizeCtrl, *m_pocCtrl;
+    wxTextCtrl *m_tsizeCtrl, *m_toriginCtrl;
+    wxRadioBox *progressionBox;
+    wxCheckBox *m_enablecommCheck, *m_enableidxCheck, *m_mctCheck, *m_irrevCheck;
+    wxCheckBox *m_sopCheck, *m_ephCheck, *m_enablebypassCheck, *m_enableresetCheck,
+               *m_enablerestartCheck, *m_enablevscCheck, *m_enableertermCheck, *m_enablesegmarkCheck;
+    wxCheckBox *m_enablepocCheck, *m_enablejpwlCheck;
+    wxSpinCtrl *m_resolutionsCtrl;
 
 protected:
 
     enum {
-		OPJENCO_ENABLEJPWL = 100,
-		OPJENCO_RATEFACTOR,
-		OPJENCO_RATERADIO,
-		OPJENCO_QUALITYFACTOR,
-		OPJENCO_QUALITYRADIO,
-		OPJENCO_RESNUMBER,
-		OPJENCO_CODEBLOCKSIZE,
-		OPJENCO_PRECINCTSIZE,
-		OPJENCO_TILESIZE,
-		OPJENCO_PROGRESSION,
-		OPJENCO_SUBSAMPLING,
-		OPJENCO_ENABLESOP,
-		OPJENCO_ENABLEEPH,
-		OPJENCO_ENABLEBYPASS,
-		OPJENCO_ENABLERESET,
-		OPJENCO_ENABLERESTART,
-		OPJENCO_ENABLEVSC,
-		OPJENCO_ENABLEERTERM,
-		OPJENCO_ENABLESEGMARK,
-		OPJENCO_ENABLEPOC,
-		OPJENCO_ROICOMP,
-		OPJENCO_ROISHIFT,
-		OPJENCO_IMORIG,
-		OPJENCO_TILORIG,
-		OPJENCO_ENABLEMCT,
-		OPJENCO_ENABLEIRREV,
-		OPJENCO_ENABLEINDEX,
-		OPJENCO_INDEXNAME,
-		OPJENCO_POCSPEC,
-		OPJENCO_ENABLECOMM,
-		OPJENCO_COMMENTTEXT,
-		OPJENCO_HPROT,
-		OPJENCO_HTILE,
-		OPJENCO_PPROT,
-		OPJENCO_PTILE,
-		OPJENCO_PPACK,
-		OPJENCO_SENSI,
-		OPJENCO_STILE
+        OPJENCO_ENABLEJPWL = 100,
+        OPJENCO_RATEFACTOR,
+        OPJENCO_RATERADIO,
+        OPJENCO_QUALITYFACTOR,
+        OPJENCO_QUALITYRADIO,
+        OPJENCO_RESNUMBER,
+        OPJENCO_CODEBLOCKSIZE,
+        OPJENCO_PRECINCTSIZE,
+        OPJENCO_TILESIZE,
+        OPJENCO_PROGRESSION,
+        OPJENCO_SUBSAMPLING,
+        OPJENCO_ENABLESOP,
+        OPJENCO_ENABLEEPH,
+        OPJENCO_ENABLEBYPASS,
+        OPJENCO_ENABLERESET,
+        OPJENCO_ENABLERESTART,
+        OPJENCO_ENABLEVSC,
+        OPJENCO_ENABLEERTERM,
+        OPJENCO_ENABLESEGMARK,
+        OPJENCO_ENABLEPOC,
+        OPJENCO_ROICOMP,
+        OPJENCO_ROISHIFT,
+        OPJENCO_IMORIG,
+        OPJENCO_TILORIG,
+        OPJENCO_ENABLEMCT,
+        OPJENCO_ENABLEIRREV,
+        OPJENCO_ENABLEINDEX,
+        OPJENCO_INDEXNAME,
+        OPJENCO_POCSPEC,
+        OPJENCO_ENABLECOMM,
+        OPJENCO_COMMENTTEXT,
+        OPJENCO_HPROT,
+        OPJENCO_HTILE,
+        OPJENCO_PPROT,
+        OPJENCO_PTILE,
+        OPJENCO_PPACK,
+        OPJENCO_SENSI,
+        OPJENCO_STILE
     };
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 // Property sheet dialog: decoder
 class OPJDecoderDialog: public wxPropertySheetDialog
 {
-DECLARE_CLASS(OPJDecoderDialog)
+    DECLARE_CLASS(OPJDecoderDialog)
 public:
     OPJDecoderDialog(wxWindow* parent, int dialogType);
     ~OPJDecoderDialog();
 
-	wxBookCtrlBase* m_settingsNotebook;
-	wxCheckBox *m_enabledecoCheck, *m_enableparseCheck;
-	wxSpinCtrl *m_reduceCtrl, *m_layerCtrl, *m_numcompsCtrl;
-	wxRadioBox* m_resizeBox;
+    wxBookCtrlBase* m_settingsNotebook;
+    wxCheckBox *m_enabledecoCheck, *m_enableparseCheck;
+    wxSpinCtrl *m_reduceCtrl, *m_layerCtrl, *m_numcompsCtrl;
+    wxRadioBox* m_resizeBox;
 
-	void OnEnableDeco(wxCommandEvent& event);
+    void OnEnableDeco(wxCommandEvent& event);
 
     wxPanel* CreateMainSettingsPage(wxWindow* parent);
     wxPanel* CreatePart1SettingsPage(wxWindow* parent);
     wxPanel* CreatePart3SettingsPage(wxWindow* parent);
 #ifdef USE_JPWL
-	void OnEnableJPWL(wxCommandEvent& event);
+    void OnEnableJPWL(wxCommandEvent& event);
     wxPanel* CreatePart11SettingsPage(wxWindow* parent);
-	wxSpinCtrl *m_expcompsCtrl, *m_maxtilesCtrl;
-	wxCheckBox *m_enablejpwlCheck;
+    wxSpinCtrl *m_expcompsCtrl, *m_maxtilesCtrl;
+    wxCheckBox *m_enablejpwlCheck;
 #endif // USE_JPWL
-	wxSpinCtrl *m_framenumCtrl;
+    wxSpinCtrl *m_framenumCtrl;
 
 
 protected:
 
     enum {
-		OPJDECO_RESMETHOD = 100,
-		OPJDECO_REDUCEFACTOR,
-		OPJDECO_QUALITYLAYERS,
-		OPJDECO_NUMCOMPS,
-		OPJDECO_ENABLEDECO,
-		OPJDECO_ENABLEPARSE,
-		OPJDECO_ENABLEJPWL,
-		OPJDECO_EXPCOMPS,
-		OPJDECO_MAXTILES,
-		OPJDECO_FRAMENUM
+        OPJDECO_RESMETHOD = 100,
+        OPJDECO_REDUCEFACTOR,
+        OPJDECO_QUALITYLAYERS,
+        OPJDECO_NUMCOMPS,
+        OPJDECO_ENABLEDECO,
+        OPJDECO_ENABLEPARSE,
+        OPJDECO_ENABLEJPWL,
+        OPJDECO_EXPCOMPS,
+        OPJDECO_MAXTILES,
+        OPJDECO_FRAMENUM
     };
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 #endif //__OPJ_VIEWER_H__
diff --git a/src/bin/wx/OPJViewer/source/about_htm.h b/src/bin/wx/OPJViewer/source/about_htm.h
index 79a859d8..cb389f8c 100644
--- a/src/bin/wx/OPJViewer/source/about_htm.h
+++ b/src/bin/wx/OPJViewer/source/about_htm.h
@@ -1,54 +1,54 @@
 wxString htmlaboutpage = wxT(
-"<html>"
-"<body bgcolor=#FFFFFF>"
-"<table cellspacing=7 cellpadding=1 border=0 width=100%>"   
-"<tr>"
-"<td rowspan=3 valign=top align=center width=70>"
-"<img src=\"memory:opj_logo.xpm\"><br><br>" 
-"</td>"
-"<td align=center>"
-"<font size=+0 color=#000000><b>" 
-OPJ_APPLICATION " " OPJ_APPLICATION_VERSION 
-"</b></font><br>"
-"<font size=-1 color=#000000><b>A JPEG 2000 image viewer</b></font><br>"  
-"<font size=-2 color=#000000><b>" OPJ_APPLICATION_PLATFORM " version</b></font>"  
-"</td>"
-"</tr>"
-"<tr height=3 valign=center>"  
-"<td valign=center  bgcolor=#cc3300></td>"   
-"</tr>"
-"<tr>"
-"<td align=justify>"
-"<center><font size=+0 color=#000000><a href=\"http://www.openjpeg.org/\">OpenJPEG</a></font></center>"
-"<p><font size=-1 color=#000000>The OpenJPEG library is an open-source JPEG 2000 codec written in C language. "
-"In addition to the basic codec, various other features are under development.</font></p><br>"
-"<font size=-2 color=red>* Build: ")
+                             "<html>"
+                             "<body bgcolor=#FFFFFF>"
+                             "<table cellspacing=7 cellpadding=1 border=0 width=100%>"
+                             "<tr>"
+                             "<td rowspan=3 valign=top align=center width=70>"
+                             "<img src=\"memory:opj_logo.xpm\"><br><br>"
+                             "</td>"
+                             "<td align=center>"
+                             "<font size=+0 color=#000000><b>"
+                             OPJ_APPLICATION " " OPJ_APPLICATION_VERSION
+                             "</b></font><br>"
+                             "<font size=-1 color=#000000><b>A JPEG 2000 image viewer</b></font><br>"
+                             "<font size=-2 color=#000000><b>" OPJ_APPLICATION_PLATFORM " version</b></font>"
+                             "</td>"
+                             "</tr>"
+                             "<tr height=3 valign=center>"
+                             "<td valign=center  bgcolor=#cc3300></td>"
+                             "</tr>"
+                             "<tr>"
+                             "<td align=justify>"
+                             "<center><font size=+0 color=#000000><a href=\"http://www.openjpeg.org/\">OpenJPEG</a></font></center>"
+                             "<p><font size=-1 color=#000000>The OpenJPEG library is an open-source JPEG 2000 codec written in C language. "
+                             "In addition to the basic codec, various other features are under development.</font></p><br>"
+                             "<font size=-2 color=red>* Build: ")
 #include "build.h"
-wxT(", " __DATE__ ", " __TIME__ "</font><br>")
-wxT("<font size=-2 color=red>* " wxVERSION_STRING "</font><br>")
-wxT("<font size=-2 color=red>* OpenJPEG " OPENJPEG_VERSION " (")
+                         wxT(", " __DATE__ ", " __TIME__ "</font><br>")
+                         wxT("<font size=-2 color=red>* " wxVERSION_STRING "</font><br>")
+                         wxT("<font size=-2 color=red>* OpenJPEG " OPENJPEG_VERSION " (")
 #ifdef USE_JPWL
-wxT("<font size=-2 color=green>JPWL</font> ")
+                         wxT("<font size=-2 color=green>JPWL</font> ")
 #endif // USE_JPWL
 #ifdef USE_JPSEC
-wxT("<font size=-2 color=green>JPSEC</font> ")
+                         wxT("<font size=-2 color=green>JPSEC</font> ")
 #endif // USE_JPSEC
-wxT(")</font><br>")
+                         wxT(")</font><br>")
 #ifdef USE_MXF
-wxT("<font size=-2 color=red>* MXFLib " MXFLIB_VERSION_MAJOR "." MXFLIB_VERSION_MINOR "." MXFLIB_VERSION_TWEAK " (" MXFLIB_VERSION_BUILD ")</font><br>")
+                         wxT("<font size=-2 color=red>* MXFLib " MXFLIB_VERSION_MAJOR "." MXFLIB_VERSION_MINOR "." MXFLIB_VERSION_TWEAK " (" MXFLIB_VERSION_BUILD ")</font><br>")
 #endif // USE_MXF
-wxT("</td>"
-"</tr>"
-"<tr>"
-"<td colspan=2 bgcolor=#CC3300 height=3 valign=center></td>" 
-"</tr>"
-"<tr>"
-"<td colspan=2>"
-"<font size=-2 color=#444444>OpenJPEG is &copy; 2002-2008 <a href=\"http://www.tele.ucl.ac.be/\">TELE</a> - <a href=\"http://www.uclouvain.be/\">Universite' Catholique de Louvain</a></font><br>"
-"<font size=-2 color=#444444>OPJViewer is &copy; 2007-2008 <a href=\"http://dsplab.diei.unipg.it/\">DSPLab</a> - <a href=\"http://www.unipg.it/\">Universita' degli studi di Perugia</a></font>"
-"</td>"
-"</tr>"
-"</table>"
-"</body>"
-"</html>"
-);
+                         wxT("</td>"
+                             "</tr>"
+                             "<tr>"
+                             "<td colspan=2 bgcolor=#CC3300 height=3 valign=center></td>"
+                             "</tr>"
+                             "<tr>"
+                             "<td colspan=2>"
+                             "<font size=-2 color=#444444>OpenJPEG is &copy; 2002-2008 <a href=\"http://www.tele.ucl.ac.be/\">TELE</a> - <a href=\"http://www.uclouvain.be/\">Universite' Catholique de Louvain</a></font><br>"
+                             "<font size=-2 color=#444444>OPJViewer is &copy; 2007-2008 <a href=\"http://dsplab.diei.unipg.it/\">DSPLab</a> - <a href=\"http://www.unipg.it/\">Universita' degli studi di Perugia</a></font>"
+                             "</td>"
+                             "</tr>"
+                             "</table>"
+                             "</body>"
+                             "</html>"
+                            );
diff --git a/src/bin/wx/OPJViewer/source/build.h b/src/bin/wx/OPJViewer/source/build.h
index f0f072c8..d49d58b6 100644
--- a/src/bin/wx/OPJViewer/source/build.h
+++ b/src/bin/wx/OPJViewer/source/build.h
@@ -1 +1 @@
-wxT("491") 
+wxT("491")
diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
index 945bba5a..8ed0f50f 100644
--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.h
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
@@ -1,6 +1,6 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
@@ -64,105 +64,105 @@ public:
         m_type = wxBITMAP_TYPE_JPEG2000;
         m_mime = wxT("image/mj2");
 
-		/* decoding */
-		m_reducefactor = 0;
-		m_qualitylayers = 0;
-		m_components = 0;
+        /* decoding */
+        m_reducefactor = 0;
+        m_qualitylayers = 0;
+        m_components = 0;
 #ifdef USE_JPWL
-		m_enablejpwl = true;
-		m_expcomps = JPWL_EXPECTED_COMPONENTS;
-		m_maxtiles = JPWL_MAXIMUM_TILES;
+        m_enablejpwl = true;
+        m_expcomps = JPWL_EXPECTED_COMPONENTS;
+        m_maxtiles = JPWL_MAXIMUM_TILES;
 #endif // USE_JPWL
 
-		/* encoding */
-		m_subsampling = wxT("1,1");
-		m_origin = wxT("0,0");
-		m_rates = wxT("20,10,5");
-		m_quality = wxT("30,35,40");
-		m_enablequality = false;
-		m_multicomp = false;
-		m_irreversible = false;
-		m_resolutions = 6;
-		m_progression = 0;
-		m_cbsize = wxT("32,32");
-		m_prsize = wxT("[128,128],[128,128]");
-		m_tsize = wxT("");
-		m_torigin = wxT("0,0");
-		/*m_progression
-		m_resilience*/
-		m_enablesop = false;
-		m_enableeph = false;
-		m_enablereset = false;
-		m_enablesegmark = false;
-		m_enablevsc = false;
-		m_enablerestart = false;
-		m_enableerterm = false;
-		m_enablebypass = false;
-		/*m_roicompo
-		m_roiup
-		m_indexfname*/
-		m_enableidx = false;
-		m_index = wxT("index.txt");
-		m_enablepoc = false;
-		m_poc = wxT("T1=0,0,1,5,3,CPRL/T1=5,0,1,6,3,CPRL");
-		m_enablecomm = true;
+        /* encoding */
+        m_subsampling = wxT("1,1");
+        m_origin = wxT("0,0");
+        m_rates = wxT("20,10,5");
+        m_quality = wxT("30,35,40");
+        m_enablequality = false;
+        m_multicomp = false;
+        m_irreversible = false;
+        m_resolutions = 6;
+        m_progression = 0;
+        m_cbsize = wxT("32,32");
+        m_prsize = wxT("[128,128],[128,128]");
+        m_tsize = wxT("");
+        m_torigin = wxT("0,0");
+        /*m_progression
+        m_resilience*/
+        m_enablesop = false;
+        m_enableeph = false;
+        m_enablereset = false;
+        m_enablesegmark = false;
+        m_enablevsc = false;
+        m_enablerestart = false;
+        m_enableerterm = false;
+        m_enablebypass = false;
+        /*m_roicompo
+        m_roiup
+        m_indexfname*/
+        m_enableidx = false;
+        m_index = wxT("index.txt");
+        m_enablepoc = false;
+        m_poc = wxT("T1=0,0,1,5,3,CPRL/T1=5,0,1,6,3,CPRL");
+        m_enablecomm = true;
 
 #if defined __WXMSW__
-		m_comment = wxT("Created by OPJViewer Win32 - OpenJPEG  version ");
+        m_comment = wxT("Created by OPJViewer Win32 - OpenJPEG  version ");
 #elif defined __WXGTK__
-		m_comment = wxT("Created by OPJViewer Lin32 - OpenJPEG version ");
+        m_comment = wxT("Created by OPJViewer Lin32 - OpenJPEG version ");
 #else
-		m_comment = wxT("Created by OPJViewer - OpenJPEG version ");
+        m_comment = wxT("Created by OPJViewer - OpenJPEG version ");
 #endif
 
 #ifdef USE_JPWL
-		m_comment += wxString::Format(wxT("%s with JPWL"), (char *) opj_version());
+        m_comment += wxString::Format(wxT("%s with JPWL"), (char *) opj_version());
 #else
-		m_comment += wxString::Format(wxT("%s"), (char *) opj_version());
+        m_comment += wxString::Format(wxT("%s"), (char *) opj_version());
 #endif
 
     }
 
-	// decoding engine parameters
-	int m_reducefactor, m_qualitylayers, m_components, m_framenum;
+    // decoding engine parameters
+    int m_reducefactor, m_qualitylayers, m_components, m_framenum;
 #ifdef USE_JPWL
-	bool m_enablejpwl;
-	int m_expcomps, m_maxtiles;
+    bool m_enablejpwl;
+    int m_expcomps, m_maxtiles;
 #endif // USE_JPWL
 
-	// encoding engine parameters
-	wxString m_subsampling;
-	wxString m_origin;
-	wxString m_rates;
-	wxString m_quality;
-	bool m_enablequality;
-	bool m_multicomp;
-	bool m_irreversible;
-	int m_resolutions;
-	int m_progression;
-	wxString m_cbsize;
-	wxString m_prsize;
-	wxString m_tsize;
-	wxString m_torigin;
-	/*m_progression
-	m_resilience*/
-	bool m_enablesop;
-	bool m_enableeph;
-	bool m_enablebypass;
-	bool m_enableerterm;
-	bool m_enablerestart;
-	bool m_enablereset;
-	bool m_enablesegmark;
-	bool m_enablevsc;
-	/*m_roicompo
-	m_roiup
-	m_indexfname*/
-	bool m_enableidx;
-	wxString m_index;
-	bool m_enablecomm;
-	wxString m_comment;
-	bool m_enablepoc;
-	wxString m_poc;
+    // encoding engine parameters
+    wxString m_subsampling;
+    wxString m_origin;
+    wxString m_rates;
+    wxString m_quality;
+    bool m_enablequality;
+    bool m_multicomp;
+    bool m_irreversible;
+    int m_resolutions;
+    int m_progression;
+    wxString m_cbsize;
+    wxString m_prsize;
+    wxString m_tsize;
+    wxString m_torigin;
+    /*m_progression
+    m_resilience*/
+    bool m_enablesop;
+    bool m_enableeph;
+    bool m_enablebypass;
+    bool m_enableerterm;
+    bool m_enablerestart;
+    bool m_enablereset;
+    bool m_enablesegmark;
+    bool m_enablevsc;
+    /*m_roicompo
+    m_roiup
+    m_indexfname*/
+    bool m_enableidx;
+    wxString m_index;
+    bool m_enablecomm;
+    wxString m_comment;
+    bool m_enablepoc;
+    wxString m_poc;
 
 #if wxUSE_STREAMS
     virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1);
@@ -172,7 +172,7 @@ protected:
 #endif
 
 private:
-	OPJ_PROG_ORDER give_progression(char progression[4]);
+    OPJ_PROG_ORDER give_progression(char progression[4]);
     DECLARE_DYNAMIC_CLASS(wxJPEG2000Handler)
 };
 
diff --git a/src/bin/wx/OPJViewer/source/imagmxf.h b/src/bin/wx/OPJViewer/source/imagmxf.h
index e4cb35df..0605399c 100644
--- a/src/bin/wx/OPJViewer/source/imagmxf.h
+++ b/src/bin/wx/OPJViewer/source/imagmxf.h
@@ -1,6 +1,6 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
@@ -66,23 +66,23 @@ public:
         m_type = wxBITMAP_TYPE_MXF;
         m_mime = wxT("image/mxf");
 
-		m_reducefactor = 0;
-		m_qualitylayers = 0;
-		m_components = 0;
-		m_filename = wxT("");
+        m_reducefactor = 0;
+        m_qualitylayers = 0;
+        m_components = 0;
+        m_filename = wxT("");
 #ifdef USE_JPWL
-		m_enablejpwl = true;
-		m_expcomps = JPWL_EXPECTED_COMPONENTS;
-		m_maxtiles = JPWL_MAXIMUM_TILES;
+        m_enablejpwl = true;
+        m_expcomps = JPWL_EXPECTED_COMPONENTS;
+        m_maxtiles = JPWL_MAXIMUM_TILES;
 #endif // USE_JPWL
     }
 
-		// decoding engine parameters
-		int m_reducefactor, m_qualitylayers, m_components, m_framenum;
-		wxFileName m_filename;
+    // decoding engine parameters
+    int m_reducefactor, m_qualitylayers, m_components, m_framenum;
+    wxFileName m_filename;
 #ifdef USE_JPWL
-		bool m_enablejpwl;
-		int m_expcomps, m_maxtiles;
+    bool m_enablejpwl;
+    int m_expcomps, m_maxtiles;
 #endif // USE_JPWL
 
 #if wxUSE_STREAMS