X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=ebca038c6c32fbc6ad3929523fbe2adcddfe7bc4;hb=0392f1a597f0b8b608c81ff5d4f7adfda6154f4f;hp=631f481f78cda69482ea5bf6fa66551721812252;hpb=99e0682c24409926fb1afd867db88a4803c734e7;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 631f481..ebca038 100644
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.141 2001/03/28 16:44:41 kevin Exp $
+**  $Id: views.cpp,v 1.142 2001/03/30 19:15:23 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -228,7 +228,7 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract)
 EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
 EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
 EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS
 EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
 #endif
 #ifdef HAVE_FFT
@@ -1195,8 +1195,8 @@ ImageFileView::OnEditPaste (wxCommandEvent& event)
       double dScale3 = 3 * 255;
       unsigned char* pixels = image.GetData();
       ImageFileArray v = rIF.getArray();
-      for (int ix = 0; ix < rIF.nx(); ix++) {
-        for (int iy = 0; iy < rIF.ny(); iy++) {
+      for (unsigned int ix = 0; ix < rIF.nx(); ix++) {
+        for (unsigned int iy = 0; iy < rIF.ny(); iy++) {
           unsigned int iBase = 3 * (iy * nx + ix);
           if (ix == 0 && iy == 0 && (pixels[iBase] == pixels[iBase+1] && pixels[iBase+1] == pixels[iBase+2]))
             bMonochrome = true;