[libcvd-members] libcvd cvd/glwindow.h cvd_src/faster_corner_10....

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/04/25 22:37:15

Modified files:
        cvd            : glwindow.h 
        cvd_src        : faster_corner_10.cxx faster_corner_12.cxx 
                         faster_corner_9.cxx glwindow.cc 
        pnm_src        : jpeg.cxx png.cc save_postscript.cxx tiff.cxx 

Log message:
        Removed misc. warnings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/glwindow.h?cvsroot=libcvd&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/faster_corner_10.cxx?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/faster_corner_12.cxx?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/faster_corner_9.cxx?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/glwindow.cc?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/jpeg.cxx?cvsroot=libcvd&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/png.cc?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/save_postscript.cxx?cvsroot=libcvd&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/tiff.cxx?cvsroot=libcvd&r1=1.6&r2=1.7

Patches:
Index: cvd/glwindow.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/glwindow.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- cvd/glwindow.h      29 Aug 2007 16:51:58 -0000      1.8
+++ cvd/glwindow.h      25 Apr 2008 22:37:13 -0000      1.9
@@ -48,7 +48,7 @@
        public:
            virtual ~EventHandler() {}
            /// Called for key press events
-           virtual void on_key_down(GLWindow& win, int key) {}
+           virtual void on_key_down(GLWindow&, int key) {}
            /// Called for key release events
            virtual void on_key_up(GLWindow& win, int key) {}
            /// Called for mouse movement events

Index: cvd_src/faster_corner_10.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/faster_corner_10.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cvd_src/faster_corner_10.cxx        23 Aug 2007 00:06:40 -0000      1.4
+++ cvd_src/faster_corner_10.cxx        25 Apr 2008 22:37:14 -0000      1.5
@@ -20,7 +20,6 @@
  
        // The compiler refuses to reserve a register for this
        register const __m128i barriers = _mm_set1_epi8((byte)barrier);
-       const byte* const end = I[I.size().y - 3]-16;
 
        int xend = I.size().x - 3;
        xend -= (I.size().x-3) % 16;

Index: cvd_src/faster_corner_12.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/faster_corner_12.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cvd_src/faster_corner_12.cxx        23 Aug 2007 01:33:35 -0000      1.3
+++ cvd_src/faster_corner_12.cxx        25 Apr 2008 22:37:14 -0000      1.4
@@ -30,7 +30,7 @@
     };
 
     template <int N> struct BitCheck<N,N> { 
-       template <class C> static inline void eval(unsigned int three, const 
byte* p, const int w, const int barrier, C& corners) {} 
+       template <class C> static inline void eval(unsigned int, const byte* , 
const int , const int , C& ) {} 
     };
 
     template <int CHUNKS, class C> inline void process_16(unsigned int three, 
const byte* p, const int w, const int barrier, C& corners)

Index: cvd_src/faster_corner_9.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/faster_corner_9.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cvd_src/faster_corner_9.cxx 23 Aug 2007 00:06:40 -0000      1.4
+++ cvd_src/faster_corner_9.cxx 25 Apr 2008 22:37:14 -0000      1.5
@@ -22,7 +22,6 @@
  
        // The compiler refuses to reserve a register for this
        register const __m128i barriers = _mm_set1_epi8((byte)barrier);
-       const byte* const end = I[I.size().y - 3]-16;
 
        int xend = I.size().x - 3;
        xend -= (I.size().x-3) % 16;

Index: cvd_src/glwindow.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/glwindow.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cvd_src/glwindow.cc 29 Aug 2007 16:51:58 -0000      1.11
+++ cvd_src/glwindow.cc 25 Apr 2008 22:37:14 -0000      1.12
@@ -267,20 +267,20 @@
     std::vector<GLWindow::Event>& events;
 public:
     SaveEvents(std::vector<GLWindow::Event>& events_) : events(events_) {}
-    void on_key_down(GLWindow& win, int key) {
+    void on_key_down(GLWindow&, int key) {
        GLWindow::Event e;
        e.type = GLWindow::Event::KEY_DOWN;
        e.which = key;
        events.push_back(e);
     }
-    void on_key_up(GLWindow& win, int key) {
+    void on_key_up(GLWindow&, int key) {
        GLWindow::Event e;
        e.type = GLWindow::Event::KEY_UP;
        e.which = key;
        events.push_back(e);
     }
 
-    void on_mouse_move(GLWindow& win, ImageRef where, int state) {
+    void on_mouse_move(GLWindow&, ImageRef where, int state) {
        GLWindow::Event e;
        e.type = GLWindow::Event::MOUSE_MOVE;
        e.state = state;
@@ -288,7 +288,7 @@
        events.push_back(e);
     }
 
-    void on_mouse_down(GLWindow& win, ImageRef where, int state, int button) {
+    void on_mouse_down(GLWindow&, ImageRef where, int state, int button) {
        GLWindow::Event e;
        e.type = GLWindow::Event::MOUSE_DOWN;
        e.state = state;
@@ -297,7 +297,7 @@
        events.push_back(e);
     }
 
-    void on_mouse_up(GLWindow& win, ImageRef where, int state, int button) {
+    void on_mouse_up(GLWindow&, ImageRef where, int state, int button) {
        GLWindow::Event e;
        e.type = GLWindow::Event::MOUSE_UP;
        e.state = state;
@@ -306,14 +306,14 @@
        events.push_back(e);
     }
 
-    void on_resize(GLWindow& win, ImageRef size) {
+    void on_resize(GLWindow&, ImageRef size) {
        GLWindow::Event e;
        e.type = GLWindow::Event::RESIZE;
        e.size = size;
        events.push_back(e);
     }
 
-    void on_event(GLWindow& win, int event) {
+    void on_event(GLWindow&, int event) {
        GLWindow::Event e;
        e.type = GLWindow::Event::EVENT;
        e.which = event;
@@ -338,12 +338,12 @@
 public:
     MakeSummary(GLWindow::EventSummary& summary_) : summary(summary_) {}
 
-    void on_key_down(GLWindow& win, int key) { ++summary.key_down[key]; }
-    void on_key_up(GLWindow& win, int key) { ++summary.key_up[key]; }
-    void on_mouse_move(GLWindow& win, ImageRef where, int state) { 
summary.cursor = where; summary.cursor_moved = true; }
-    void on_mouse_down(GLWindow& win, ImageRef where, int state, int button) { 
summary.mouse_down[button] = std::make_pair(where,state); }
-    void on_mouse_up(GLWindow& win, ImageRef where, int state, int button) { 
summary.mouse_up[button] = std::make_pair(where,state); }
-    void on_event(GLWindow& win, int event) { ++summary.events[event]; }
+    void on_key_down(GLWindow&, int key) {     ++summary.key_down[key]; }
+    void on_key_up(GLWindow&, int key) { ++summary.key_up[key]; }
+    void on_mouse_move(GLWindow&, ImageRef where, int) { summary.cursor = 
where; summary.cursor_moved = true; }
+    void on_mouse_down(GLWindow&, ImageRef where, int state, int button) { 
summary.mouse_down[button] = std::make_pair(where,state); }
+    void on_mouse_up(GLWindow&, ImageRef where, int state, int button) { 
summary.mouse_up[button] = std::make_pair(where,state); }
+    void on_event(GLWindow&, int event) { ++summary.events[event]; }
 };
 
 void GLWindow::get_events(EventSummary& summary)

Index: pnm_src/jpeg.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/jpeg.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- pnm_src/jpeg.cxx    13 Feb 2008 00:30:43 -0000      1.10
+++ pnm_src/jpeg.cxx    25 Apr 2008 22:37:14 -0000      1.11
@@ -134,7 +134,7 @@
                }
        }
 
-       static void s_term_source(j_decompress_ptr p)
+       static void s_term_source(j_decompress_ptr)
        {
        }
 };

Index: pnm_src/png.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/png.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pnm_src/png.cc      9 Oct 2007 16:55:31 -0000       1.4
+++ pnm_src/png.cc      25 Apr 2008 22:37:14 -0000      1.5
@@ -14,7 +14,7 @@
        *(string*)(png_ptr->error_ptr) = error_msg;
 }
 
-static void warn_fn(png_structp png_ptr, png_const_charp error_msg)
+static void warn_fn(png_structp, png_const_charp )
 {
 }
 
@@ -216,6 +216,8 @@
                case GreyAlpha: c_type = PNG_COLOR_TYPE_GRAY_ALPHA; break;
                case Rgb: c_type = PNG_COLOR_TYPE_RGB; break;
                case RgbAlpha: c_type = PNG_COLOR_TYPE_RGB_ALPHA; break;
+               default:
+                       throw Exceptions::Image_IO::MalformedImage("unknown 
pixel format");
        }
 
 

Index: pnm_src/save_postscript.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/save_postscript.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pnm_src/save_postscript.cxx 28 Nov 2005 18:59:05 -0000      1.7
+++ pnm_src/save_postscript.cxx 25 Apr 2008 22:37:14 -0000      1.8
@@ -146,7 +146,7 @@
 
 void ps_out::write_raw_pixel_lines(const unsigned char* data, unsigned long 
nlines)
 {
-       if(nlines + lines > ys)
+       if((long)nlines + lines > ys)
                throw CVD::Exceptions::Image_IO::WriteError("Postscript: 
Internal error: attempting to write too many lines.");
 
        const unsigned char* end = data + (nlines * xs)*m_channels;     

Index: pnm_src/tiff.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/tiff.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pnm_src/tiff.cxx    8 Mar 2006 19:05:23 -0000       1.6
+++ pnm_src/tiff.cxx    25 Apr 2008 22:37:15 -0000      1.7
@@ -38,7 +38,8 @@
        return i->i.gcount();
 }
 
-tsize_t tiff_in::write(thandle_t vis, tdata_t data, tsize_t count)
+//tsize_t tiff_in::write(thandle_t vis, tdata_t data, tsize_t count)
+tsize_t tiff_in::write(thandle_t, tdata_t, tsize_t)
 {
        return 0;
 }
@@ -63,7 +64,7 @@
        return ii->length;
 }
 
-int tiff_in::close(thandle_t vis)
+int tiff_in::close(thandle_t)
 {
        return 0;
 }
@@ -81,7 +82,7 @@
 static const int error_size=512;
 static char error_msg[error_size]="";
 
-static void tiff_error_handler(const char* module, const char* fmt, va_list ap)
+static void tiff_error_handler(const char*, const char* fmt, va_list ap)
 {
        int n = vsnprintf(error_msg, error_size, fmt, ap);
        if(n == error_size)