Attachment 133116 Details for Bug 177512 – file.diff

[patch] file.diff

file.diff (text/plain), 1.39 KB, created by dnebdal on 2013-03-30 20:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dnebdal

Created: 2013-03-30 20:40:01 UTC

Size: 1.39 KB

patch

obsolete

>--- frend.cc	2009-12-21 23:38:54.000000000 +0100
>+++ frend.cc	2013-03-30 21:11:20.702747627 +0100
>@@ -373,7 +373,7 @@
> 
> /* ############################ dimension ############################## */
> template <class T>
>-void dimension<T>::input(std::istream& i)
>+std::istream& dimension<T>::input(std::istream& i)
> {
>   std::string buf, buf2;
>   i >> buf;
>--- frend.h	2009-12-21 05:36:15.000000000 +0100
>+++ frend.h	2013-03-30 21:11:44.611746201 +0100
>@@ -187,7 +187,7 @@
>   dimension& operator+=(const dimension& p) { _x+=p._x; _y+=p._y; return *this; }
>   dimension& operator-=(const dimension& p) { _x-=p._x; _y-=p._y; return *this; }
>   void print(std::ostream& o) const;
>-  void input(std::istream& i);
>+  std::istream& input(std::istream& i);
> };
> typedef dimension<int> Point;
> typedef dimension<size_t> Size;
>--- rom.cc	2009-12-22 01:06:07.000000000 +0100
>+++ rom.cc	2013-03-30 21:10:25.279746508 +0100
>@@ -21,9 +21,7 @@
> #include "rom.h"
> #include "prefs.h"
> 
>-#ifdef HAVE_ZLIB_H
>-# include <zlib.h>
>-#endif
>+#include <zlib.h>
> 
> namespace fr = frend;
> 
>@@ -209,9 +207,9 @@
> 	};
> #ifdef ZLIB_VERSION
> # define romopen(f) (gzFile*)gzopen(f.c_str(), "rb")
>-# define romseek gzseek
>-# define romread gzread
>-# define romclose gzclose
>+# define romseek(a, b, c) gzseek(*a, b, c)
>+# define romread(a, b, c) gzread(*a, b, c)
>+# define romclose(a) gzclose(*a)
>    gzFile *fptr;
> #else
> # define romopen(f) fopen(f.c_str(), "rb")

Actions: View | Diff

Attachments on bug 177512: 133116