[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd/cvd/internal/io pnm_grok.h
From: |
Edward Rosten |
Subject: |
[libcvd-members] libcvd/cvd/internal/io pnm_grok.h |
Date: |
Thu, 24 Apr 2008 20:48:57 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 08/04/24 20:48:56
Modified files:
cvd/internal/io: pnm_grok.h
Log message:
Fix silly error.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/pnm_grok.h?cvsroot=libcvd&r1=1.6&r2=1.7
Patches:
Index: pnm_grok.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/pnm_grok.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pnm_grok.h 24 Apr 2008 16:12:38 -0000 1.6
+++ pnm_grok.h 24 Apr 2008 20:48:56 -0000 1.7
@@ -67,8 +67,8 @@
std::vector<array> rowbuf(pnm.x_size());
for (int r=0; r<pnm.y_size(); r++)
{
- pnm.get_raw_pixel_lines((S*) &rowbuf[0], 1);
- Pixel::ConvertPixels<array,
T>::convert(&rowbuf[0], im[r], pnm.x_size());
+ pnm.get_raw_pixel_lines((S*) &(rowbuf[0]), 1);
+ Pixel::ConvertPixels<array,
T>::convert(&(rowbuf[0]), im[r], pnm.x_size());
}
}
};
@@ -80,8 +80,8 @@
std::vector<S> rowbuf(pnm.x_size());
for (int r=0; r<pnm.y_size(); r++)
{
- pnm.get_raw_pixel_lines(&rowbuf[0], 1);
- Pixel::ConvertPixels<S, T>::convert(&rowbuf[0],
im[r], pnm.x_size());
+ pnm.get_raw_pixel_lines(&(rowbuf[0]), 1);
+ Pixel::ConvertPixels<S,
T>::convert(&(rowbuf[0]), im[r], pnm.x_size());
}
}
};
@@ -168,8 +168,8 @@
writePNMHeader(out, 3, im.size(), 65535, false, "");
std::vector<array> rowbuf[im.size().x];
for (int r=0; r<im.size().y; r++) {
- Pixel::ConvertPixels<T, array>::convert(im[r], &rowbuf[0],
im.size().x);
- writePNMPixels(out, (const unsigned short*)&rowbuf[0], im.size().x*3,
false);
+ Pixel::ConvertPixels<T, array>::convert(im[r], &(rowbuf[0]),
im.size().x);
+ writePNMPixels(out, (const unsigned short*)&(rowbuf[0]),
im.size().x*3, false);
}
}
};
@@ -180,8 +180,8 @@
writePNMHeader(out, 3, im.size(), 255, false, "");
std::vector<array> rowbuf[im.size().x];
for (int r=0; r<im.size().y; r++) {
- Pixel::ConvertPixels<T, array>::convert(im[r], &rowbuf[0],
im.size().x);
- writePNMPixels(out, (const byte*)&rowbuf[0], im.size().x*3, false);
+ Pixel::ConvertPixels<T, array>::convert(im[r], &(rowbuf[0]),
im.size().x);
+ writePNMPixels(out, (const byte*)&(rowbuf[0]), im.size().x*3, false);
}
}
};
@@ -192,8 +192,8 @@
writePNMHeader(out, 1, im.size(), 65535, false, "");
std::vector<S> rowbuf(im.size().x);
for (int r=0; r<im.size().y; r++) {
- Pixel::ConvertPixels<T, S>::convert(im[r], &rowbuf[0], im.size().x);
- writePNMPixels(out, &rowbuf[0], im.size().x, false);
+ Pixel::ConvertPixels<T, S>::convert(im[r], &(rowbuf[0]), im.size().x);
+ writePNMPixels(out, &(rowbuf[0]), im.size().x, false);
}
}
};
@@ -204,8 +204,8 @@
writePNMHeader(out, 1, im.size(), 255, false, "");
std::vector<S> rowbuf(im.size().x);
for (int r=0; r<im.size().y; r++) {
- Pixel::ConvertPixels<T, S>::convert(im[r], &rowbuf[0], im.size().x);
- writePNMPixels(out, &rowbuf[0], im.size().x, false);
+ Pixel::ConvertPixels<T, S>::convert(im[r], &(rowbuf[0]), im.size().x);
+ writePNMPixels(out, &(rowbuf[0]), im.size().x, false);
}
}
};