From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sun, 9 Jun 2013 23:05:43 +0000 (+0000)
Subject: garmin_gpi: Seek to image offset in case there's additional headers in the
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~568
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=66a36f833710d0032910d18cb4a890f4efae6913;p=gpsbabel.git

garmin_gpi: Seek to image offset in case there's additional headers in the
bmp, such as those inserted by gimp, etc.
Fix warning when compiling with debug.
---

diff --git a/gpsbabel/garmin_gpi.cc b/gpsbabel/garmin_gpi.cc
index cd055b2cc..11a6cd37b 100644
--- a/gpsbabel/garmin_gpi.cc
+++ b/gpsbabel/garmin_gpi.cc
@@ -678,7 +678,7 @@ read_tag(const char* caller, const int tag, waypoint* wpt)
 #ifdef GPI_DBG
   {
     int x;
-    unsigned char* b = xmalloc(sz);
+    unsigned char* b = (unsigned char*) xmalloc(sz);
     fprintf(stderr, "Tag: %x\n", tag);
     gbfread(b, 1, sz, fin);
     fprintf(stderr, "\n");