[GRASS-SVN] r31327 - grass/branches/develbranch_6/lib/ogsf

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-05-13 03:00:14 -0400 (Tue, 13 May 2008)
New Revision: 31327

Modified:
   grass/branches/develbranch_6/lib/ogsf/gk.c
   grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c
Log:
ogsflib: Fix int/long mismatch in gk_follow_frames()
Fix void return from non-void function add_video_stream()
Include <grass/glocale.h> for _(...) macro
[merged from trunk]


Modified: grass/branches/develbranch_6/lib/ogsf/gk.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gk.c	2008-05-12 22:11:36 UTC (rev 31326)
+++ grass/branches/develbranch_6/lib/ogsf/gk.c	2008-05-13 07:00:14 UTC (rev 31327)
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <math.h>
 
+#include <grass/glocale.h>
 #include <grass/gstypes.h>
 #include <grass/keyframe.h>
 #include <grass/kftypes.h>
@@ -173,7 +174,7 @@
 
 	GS_get_from(tmp);
 	G_debug(3, "gk_follow_frames():");
-	G_debug(3, "  MASK: %x", mask);
+	G_debug(3, "  MASK: %lx", mask);
 	G_debug(3, "  FROM: %f %f %f", tmp[X], tmp[Y], tmp[Z]);
 
 	/* ACS 1 line: was 	GS_get_focus(tmp);

Modified: grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c	2008-05-12 22:11:36 UTC (rev 31326)
+++ grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c	2008-05-13 07:00:14 UTC (rev 31327)
@@ -53,7 +53,7 @@
     st = av_new_stream(oc, 0);
     if (!st) {
         fprintf(stderr, "Could not alloc stream\n");
-	return;
+	return NULL;
     }
 
     c = st->codec;