Index: ChangeLog
from Simon Odou <simon(a)lrde.epita.fr>
* tests/convert/tests/value_to_point: Fix a wrong instruction.
* oln/io/read_image_2d_pnm.hh: Move static variables inside an
inline function to attributes.
* img/object.pbm: New. Add missing image for dilation and erosion
tests.
img/object.pbm | 0
oln/io/read_image_2d_pnm.hh | 7 ++++---
tests/convert/tests/value_to_point | 1 -
3 files changed, 4 insertions, 4 deletions
Index: tests/convert/tests/value_to_point
--- tests/convert/tests/value_to_point (revision 94)
+++ tests/convert/tests/value_to_point (working copy)
@@ -17,7 +17,6 @@
std::cout << p2.col() << std::endl;
std::cout << p2.slice() << std::endl;
std::cout << p2 << std::endl;
-fdas
if (p.index() != 42 ||
p2.row() != 6 ||
p2.col() != 64 ||
Index: oln/io/read_image_2d_pnm.hh
--- oln/io/read_image_2d_pnm.hh (revision 94)
+++ oln/io/read_image_2d_pnm.hh (working copy)
@@ -84,6 +84,8 @@
mlc::box<I> image_;
std::istream& istr_;
internal::pnm_info& info_;
+ char v;
+ int offset;
read_image_2d_raw(I& image,
std::istream &istr,
@@ -91,7 +93,8 @@
super_type(image),
image_(image),
istr_(istr),
- info_(info)
+ info_(info),
+ offset(-1)
{}
@@ -163,8 +166,6 @@
void read_value_type(ntg::bin &c)
{
- static char v;
- static int offset = -1;
if (offset == -1)
{
Index: img/object.pbm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: img/object.pbm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Show replies by date