lm1100-1.0.2a-fix-compile-gcc-4.1.patch 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374
  1. diff -ru lm1100.1.0.2a~/Jet.h lm1100.1.0.2a/Jet.h
  2. --- lm1100.1.0.2a~/Jet.h 2006-12-02 18:48:16.000000000 +0100
  3. +++ lm1100.1.0.2a/Jet.h 2006-12-02 18:49:54.000000000 +0100
  4. @@ -45,7 +45,7 @@
  5. Coord imageStart; // start of image from edge of paper
  6. bool insideImage(int x, int y);
  7. - bool Jet::needsPainting(int ix, int iy, int bit);
  8. + bool needsPainting(int ix, int iy, int bit);
  9. public:
  10. /* Range of paper jet covers when head is at 0,0 */
  11. @@ -54,7 +54,7 @@
  12. /* Range of paper jet needs to cover to get the entire image */
  13. void getImageRange(Rect *dest);
  14. Coord *getPreferredImageStart(Coord *start);
  15. - int Jet::getPreferredEnd();
  16. + int getPreferredEnd();
  17. bool finished();
  18. void setImageStart(Coord *imageStart);
  19. void paint(int startX, int endX, int y, class LexmarkProtocol *protocol);
  20. diff -ru lm1100.1.0.2a~/LinkedList.h lm1100.1.0.2a/LinkedList.h
  21. --- lm1100.1.0.2a~/LinkedList.h 2006-12-02 18:48:16.000000000 +0100
  22. +++ lm1100.1.0.2a/LinkedList.h 2006-12-02 18:49:54.000000000 +0100
  23. @@ -26,8 +26,8 @@
  24. void *object;
  25. LinkedList *next;
  26. - LinkedList::LinkedList();
  27. - LinkedList::LinkedList(void * object);
  28. + LinkedList();
  29. + LinkedList(void * object);
  30. };
  31. #endif
  32. diff -ru lm1100.1.0.2a~/Map.h lm1100.1.0.2a/Map.h
  33. --- lm1100.1.0.2a~/Map.h 2006-12-02 18:48:16.000000000 +0100
  34. +++ lm1100.1.0.2a/Map.h 2006-12-02 18:49:54.000000000 +0100
  35. @@ -41,7 +41,7 @@
  36. int height; /* height of map in cells */
  37. Map(int width, int height, int cellSize);
  38. - Map::~Map();
  39. + ~Map();
  40. void cacheLines(int start, int len);
  41. void addAlgorithm(MapAlgorithm *algorithm);
  42. diff -ru lm1100.1.0.2a~/PPMRaw.h lm1100.1.0.2a/PPMRaw.h
  43. --- lm1100.1.0.2a~/PPMRaw.h 2006-12-02 18:48:16.000000000 +0100
  44. +++ lm1100.1.0.2a/PPMRaw.h 2006-12-02 18:49:54.000000000 +0100
  45. @@ -32,7 +32,7 @@
  46. public:
  47. PPMRaw(Reader *reader,bool readMagic);
  48. - static void PPMRaw::readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic);
  49. + static void readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic);
  50. virtual void getRGB(RGB *rgb, int x, int y);
  51. diff -ru lm1100.1.0.2a~/Rect.h lm1100.1.0.2a/Rect.h
  52. --- lm1100.1.0.2a~/Rect.h 2006-12-02 18:48:16.000000000 +0100
  53. +++ lm1100.1.0.2a/Rect.h 2006-12-02 18:49:54.000000000 +0100
  54. @@ -23,8 +23,8 @@
  55. class Rect
  56. {
  57. public:
  58. - Rect::Rect();
  59. - Rect::Rect(int x, int y, int width, int height);
  60. + Rect();
  61. + Rect(int x, int y, int width, int height);
  62. int x,y,width,height;