toycars/toycars.patch

   1 diff -U 3 -H -d -r -N -- toycars-0.3.10/toycars_track_editor/src/TrackView.cxx toycars-0.3.10.ok/toycars_track_editor/src/TrackView.cxx
   2 --- toycars-0.3.10/toycars_track_editor/src/TrackView.cxx       2009-06-27 23:13:24.000000000 -0400
   3 +++ toycars-0.3.10.ok/toycars_track_editor/src/TrackView.cxx    2009-07-19 13:28:39.000000000 -0400
   4 @@ -89,7 +89,8 @@
   5  //{jpg,png,bmp,pnm,pbm,pgm,ppm}
   6  Fl_Image* loadImage(const char *filename)
   7  {
   8 -   char *suffix = strrchr(filename, '.');
   9 +   char *suffix = const_cast<char*>(strrchr(filename, '.'));
  10 +   *suffix = 'e';
  11     if (suffix == NULL)
  12        return NULL;
  13     if (strcmp(suffix,".jpg") == 0)
  14 @@ -969,13 +970,13 @@
  15     uninstallMap(name);
  16
  17     // chop off any .xml suffix
  18 -   temp = strrchr(name, '.');
  19 +   temp = const_cast<char*>(strrchr(name, '.'));
  20     if (temp) {
  21        if (strcmp(temp, ".xml") == 0)
  22           temp[0] = '\0';
  23     }
  24     // remove path
  25 -   temp = strrchr(name, '/');
  26 +   temp = const_cast<char*>(strrchr(name, '/'));
  27     if (temp) {
  28        strncpy(trackname, temp+1, 255);
  29     }
  30 @@ -1044,13 +1045,13 @@
  31     char *temp;
  32
  33     // chop off any .xml suffix
  34 -   temp = strrchr(name, '.');
  35 +   temp = const_cast<char*>(strrchr(name, '.'));
  36     if (temp) {
  37        if (strcmp(temp, ".xml") == 0)
  38           temp[0] = '\0';
  39     }
  40     // remove path
  41 -   temp = strrchr(name, '/');
  42 +   temp = const_cast<char*>(strrchr(name, '/'));
  43     if (temp) {
  44        strncpy(trackname, temp+1, 255);
  45     }
  46 diff -U 3 -H -d -r -N -- toycars-0.3.10/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp toycars-0.3.10.ok/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp
  47 --- toycars-0.3.10/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp   2009-02-26 14:24:22.000000000 -0500
  48 +++ toycars-0.3.10.ok/toycars_vehicle_editor/src/LoadSpriteFromImage.cpp        2009-07-19 13:32:35.000000000 -0400
  49 @@ -23,7 +23,8 @@
  50  //{jpg,png,bmp,pnm,pbm,pgm,ppm}
  51  Fl_Image* loadImage(const char *filename)
  52  {
  53 -   char *suffix = strrchr(filename, '.');
  54 +   char *suffix = const_cast<char*>(strrchr(filename, '.'));
  55 +   *suffix = 'e';
  56     if (suffix == NULL)
  57        return NULL;
  58     if (strcmp(suffix,".jpg") == 0)
  59 diff -U 3 -H -d -r -N -- toycars-0.3.10/toycars_vehicle_editor/src/VehicleObject.cpp toycars-0.3.10.ok/toycars_vehicle_editor/src/VehicleObject.cpp
  60 --- toycars-0.3.10/toycars_vehicle_editor/src/VehicleObject.cpp 2009-03-22 15:45:31.000000000 -0400
  61 +++ toycars-0.3.10.ok/toycars_vehicle_editor/src/VehicleObject.cpp      2009-07-19 13:32:28.000000000 -0400
  62 @@ -533,13 +533,13 @@
  63     uninstallVehicle(name);
  64
  65     // chop off any .xml suffix
  66 -   temp = strrchr(name, '.');
  67 +   temp = const_cast<char*>(strrchr(name, '.'));
  68     if (temp) {
  69        if (strcmp(temp, ".xml") == 0)
  70           temp[0] = '\0';
  71     }
  72     // remove path
  73 -   temp = strrchr(name, '/');
  74 +   temp = const_cast<char*>(strrchr(name, '/'));
  75     if (temp) {
  76        strncpy(carname, temp+1, 255);
  77     }
  78 @@ -610,13 +610,13 @@
  79     char *temp;
  80
  81     // chop off any .xml suffix
  82 -   temp = strrchr(name, '.');
  83 +   temp = const_cast<char*>(strrchr(name, '.'));
  84     if (temp) {
  85        if (strcmp(temp, ".xml") == 0)
  86           temp[0] = '\0';
  87     }
  88     // remove path
  89 -   temp = strrchr(name, '/');
  90 +   temp = const_cast<char*>(strrchr(name, '/'));
  91     if (temp) {
  92        strncpy(carname, temp+1, 255);
  93     }
  94 @@ -675,4 +675,4 @@
  95     system(str);
  96     */
  97  #endif
  98 -}
  99 \ No newline at end of file
 100 +}