[gimp-gap] fixes to reduce compile warnings (based on patches provided at #585343)
- From: Wolfgang Hofer <wolfgangh src gnome org>
- To: svn-commits-list gnome org
- Subject: [gimp-gap] fixes to reduce compile warnings (based on patches provided at #585343)
- Date: Sat, 20 Jun 2009 04:18:38 -0400 (EDT)
commit 5293df5d5ca22600bf75283a051fc7610c8b23b3
Author: Wolfgang Hofer <wolfgangh svn gnome org>
Date: Sat Jun 20 10:16:57 2009 +0200
fixes to reduce compile warnings (based on patches provided at #585343)
ChangeLog | 35 ++++++++++++++++++++++++++++++++++
extern_libs/Makefile.am | 6 ++--
gap/gap_pdb_calls.c | 14 ++++++------
gap/gap_pdb_calls.h | 2 +
gap/gap_split.c | 1 +
gap/gap_story_dialog.c | 33 ++++++++++++++-----------------
gap/gap_story_dialog.h | 2 +
gap/gap_story_properties.c | 1 +
gap/gap_story_section_properties.c | 2 +-
gap/gap_story_sox.c | 2 +
gap/gap_wr_color_curve.c | 2 +-
gap/gimplastvaldesc.c | 2 +-
libgapbase/gap_base.c | 2 +
libgapvidapi/gap_vid_api.c | 1 +
libgapvidapi/gap_vid_api_ffmpeg.c | 3 +-
libgapvidapi/gap_vid_api_util.c | 12 ++++++++--
libgapvidapi/gap_vid_api_vidindex.c | 2 +
libgapvidutil/gap_gve_misc_util.c | 3 ++
libgapvidutil/gap_gve_png.c | 7 ++++-
libgapvidutil/gap_gve_png.h | 2 +-
vid_common/gap_cme_callbacks.c | 4 +-
vid_common/gap_cme_gui.c | 1 +
vid_enc_avi/gap_enc_avi_main.c | 1 +
vid_enc_ffmpeg/gap_enc_ffmpeg_main.c | 2 +
24 files changed, 102 insertions(+), 40 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8e1abf2..fdb6104 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2009-06-20 Wolfgang Hofer <hof gimp org>
+
+- fixes for many compiler warnings
+ applied patches provided by Stanislav Brabecat at bugzilla #585343
+ this includes a fix in gap_vid_api.c relevant for
+ correct handling of deinterlacing video frames.
+
+- replaced deprecated gimp_md5_get_digest procedure by GChecksum from GLib
+ (as suggested in the gimpmd5.c sourcecode)
+
+ * extern_libs/Makefile.am
+ * gap/gap_pdb_calls.c
+ * gap/gap_pdb_calls.h
+ * gap/gap_split.c
+ * gap/gap_story_dialog.c
+ * gap/gap_story_dialog.h
+ * gap/gap_story_properties.c
+ * gap/gap_story_section_properties.c
+ * gap/gap_story_sox.c
+ * gap/gap_wr_color_curve.c
+ * gap/gimplastvaldesc.c
+ * libgapbase/gap_base.c
+ * libgapvidapi/gap_vid_api_ffmpeg.c
+ * libgapvidapi/gap_vid_api_util.c
+ * libgapvidapi/gap_vid_api_vidindex.c
+ * libgapvidutil/gap_gve_misc_util.c
+ * libgapvidutil/gap_gve_png.c
+ * libgapvidutil/gap_gve_png.h
+ * vid_common/gap_cme_gui.c
+ * vid_enc_avi/gap_enc_avi_main.c
+ * vid_enc_ffmpeg/gap_enc_ffmpeg_main.c
+
+ * libgapvidapi/gap_vid_api.c
+ * vid_common/gap_cme_callbacks.c
+
2009-05-22 Wolfgang Hofer <hof gimp org>
- applied changes from gap-2-6 branch to master
diff --git a/extern_libs/Makefile.am b/extern_libs/Makefile.am
index 4b1419b..157dd5d 100644
--- a/extern_libs/Makefile.am
+++ b/extern_libs/Makefile.am
@@ -68,9 +68,9 @@ $(x_libmpeg3):
endif
install-data-hook:
- rm -f $(GAPLIBDIR)/libavformat.a \
- rm -f $(GAPLIBDIR)/libavcodec.a \
- rm -f $(GAPLIBDIR)/libmpeg3.a
+ rm -f $(DESTDIR)$(GAPLIBDIR)/libavformat.a \
+ rm -f $(DESTDIR)$(GAPLIBDIR)/libavcodec.a \
+ rm -f $(DESTDIR)$(GAPLIBDIR)/libmpeg3.a
EXTRA_DIST = \
README_extern_libs \
diff --git a/gap/gap_pdb_calls.c b/gap/gap_pdb_calls.c
index 49f226b..41cd070 100644
--- a/gap/gap_pdb_calls.c
+++ b/gap/gap_pdb_calls.c
@@ -52,11 +52,11 @@
extern int gap_debug;
/* ============================================================================
- * p_status_to_string
+ * gap_status_to_string
* ============================================================================
*/
const char *
-p_status_to_string(int status)
+gap_status_to_string(int status)
{
switch (status)
{
@@ -73,7 +73,7 @@ p_status_to_string(int status)
default:
return ("* unknown *");
}
-} /* end p_status_to_string */
+} /* end gap_status_to_string */
/* check if procedure name is available in the PDB.
@@ -247,7 +247,7 @@ gap_pdb_gimp_displays_reconnect(gint32 old_image_id, gint32 new_image_id)
printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n"
, l_called_proc
, (int)return_vals[0].data.d_status
- , p_status_to_string(return_vals[0].data.d_status)
+ , gap_status_to_string(return_vals[0].data.d_status)
);
return(FALSE);
} /* end gap_pdb_gimp_displays_reconnect */
@@ -285,7 +285,7 @@ gap_pdb_gimp_layer_new_from_drawable(gint32 drawable_id, gint32 dst_image_id)
printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n"
, l_called_proc
, (int)return_vals[0].data.d_status
- , p_status_to_string(return_vals[0].data.d_status)
+ , gap_status_to_string(return_vals[0].data.d_status)
);
return(-1);
@@ -324,7 +324,7 @@ gap_pdb_gimp_file_save_thumbnail(gint32 image_id, char* filename)
, filename
, (int)image_id
, (int)return_vals[0].data.d_status
- , p_status_to_string(return_vals[0].data.d_status)
+ , gap_status_to_string(return_vals[0].data.d_status)
);
return(FALSE);
} /* end gap_pdb_gimp_file_save_thumbnail */
@@ -412,7 +412,7 @@ workaround:
printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n"
, l_called_proc
, (int)return_vals[0].data.d_status
- , p_status_to_string(return_vals[0].data.d_status)
+ , gap_status_to_string(return_vals[0].data.d_status)
);
return(FALSE);
} /* end gap_pdb_gimp_image_thumbnail */
diff --git a/gap/gap_pdb_calls.h b/gap/gap_pdb_calls.h
index 6c0fd11..814b37a 100644
--- a/gap/gap_pdb_calls.h
+++ b/gap/gap_pdb_calls.h
@@ -40,6 +40,8 @@
#include "libgimp/gimp.h"
+const char *gap_status_to_string(int status);
+
gint gap_pdb_procedure_available(char *proc_name);
gint32 gap_pdb_gimp_rotate_degree(gint32 drawable_id, gboolean interpolation, gdouble angle_deg);
diff --git a/gap/gap_split.c b/gap/gap_split.c
index b7bb6ce..cc3dad3 100644
--- a/gap/gap_split.c
+++ b/gap/gap_split.c
@@ -54,6 +54,7 @@
#endif
/* GIMP includes */
+#include <glib/gstdio.h>
#include "gtk/gtk.h"
#include "config.h"
#include "gap-intl.h"
diff --git a/gap/gap_story_dialog.c b/gap/gap_story_dialog.c
index 87a02c9..af6a20b 100644
--- a/gap/gap_story_dialog.c
+++ b/gap/gap_story_dialog.c
@@ -393,8 +393,6 @@ static GtkWidget * p_create_button_bar(GapStbTabWidgets *tabw
,gint32 mount_vs_row
);
-GtkWidget * p_gtk_button_new_from_stock_icon(const char *stock_id);
-
static gint32 p_get_gimprc_preview_size(const char *gimprc_option_name);
static void p_save_gimprc_preview_size(const char *gimprc_option_name, gint32 preview_size);
static void p_save_gimprc_int_value(const char *gimprc_option_name, gint32 value);
@@ -2443,7 +2441,6 @@ p_player_img_mode_cb (GtkWidget *w,
{
gint32 imagewidth;
gint32 imageheight;
- long framenr;
@@ -2464,8 +2461,8 @@ p_player_img_mode_cb (GtkWidget *w,
,imageheight
,GAP_PLAYER_DONT_FORCE_ASPECT
,sgpp->image_id
- ,framenr /* play from start */
- ,framenr /* play until end */
+ ,-1 /* play from start */
+ ,-1 /* play until end */
,FALSE /* play all */
,1 /* seltrack */
,0.0 /* delace */
@@ -7611,7 +7608,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
/* with_load_and_save button */
{
/* The Load button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_OPEN );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_OPEN );
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (p_tabw_load_file_cb),
@@ -7631,7 +7628,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
gtk_widget_show (button);
/* The Save button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_SAVE );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_SAVE );
tabw->save_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
if(tabw->type == GAP_STB_MASTER_TYPE_STORYBOARD)
@@ -7673,7 +7670,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
}
/* The Section Properties button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_PROPERTIES );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_PROPERTIES );
//tabw->edit_story_properties_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -7708,7 +7705,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
/* The Undo button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_UNDO );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_UNDO );
tabw->undo_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -7718,7 +7715,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
gtk_widget_show (button);
/* The Redo button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_REDO );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_REDO );
tabw->redo_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -7729,7 +7726,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
/* The Cut button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_CUT );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_CUT );
tabw->edit_cut_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -7741,7 +7738,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
gtk_widget_show (button);
/* The Copy button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_COPY );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_COPY );
tabw->edit_copy_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -7753,7 +7750,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
gtk_widget_show (button);
/* The Paste button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_PASTE );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_PASTE );
tabw->edit_paste_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -7765,7 +7762,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
gtk_widget_show (button);
/* The New Clip button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_NEW );
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_NEW );
tabw->new_clip_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "button_press_event",
@@ -7782,7 +7779,7 @@ p_create_button_bar(GapStbTabWidgets *tabw
/* The Play Button */
- button = p_gtk_button_new_from_stock_icon (GAP_STOCK_PLAY);
+ button = gap_gtk_button_new_from_stock_icon (GAP_STOCK_PLAY);
tabw->play_button = button;
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
gimp_help_set_help_data (button,
@@ -7885,13 +7882,13 @@ p_create_button_bar(GapStbTabWidgets *tabw
} /* end p_create_button_bar */
/* --------------------------------
- * p_gtk_button_new_from_stock_icon
+ * gap_gtk_button_new_from_stock_icon
* --------------------------------
* create a button from stock, using only the icon
* (the text assotiated with the stock id is not rendered,
* to keep the button width small)
*/
-GtkWidget * p_gtk_button_new_from_stock_icon(const char *stock_id)
+GtkWidget * gap_gtk_button_new_from_stock_icon(const char *stock_id)
{
GtkWidget *button;
GtkWidget *image;
@@ -7903,7 +7900,7 @@ GtkWidget * p_gtk_button_new_from_stock_icon(const char *stock_id)
gtk_container_add (GTK_CONTAINER (button), image);
return(button);
-} /* end p_gtk_button_new_from_stock_icon */
+} /* end gap_gtk_button_new_from_stock_icon */
diff --git a/gap/gap_story_dialog.h b/gap/gap_story_dialog.h
index 8164e3c..da63ebb 100644
--- a/gap/gap_story_dialog.h
+++ b/gap/gap_story_dialog.h
@@ -71,4 +71,6 @@ void gap_story_dlg_update_edit_settings(GapStoryBoard *stb
, GapStbTabWidgets *tabw
);
+GtkWidget * gap_gtk_button_new_from_stock_icon(const char *stock_id);
+
#endif
diff --git a/gap/gap_story_properties.c b/gap/gap_story_properties.c
index 13c4a9c..3454aee 100644
--- a/gap/gap_story_properties.c
+++ b/gap/gap_story_properties.c
@@ -55,6 +55,7 @@
#include "gap_timeconv.h"
#include "gap_thumbnail.h"
#include "gap_fmac_base.h"
+#include "gap_fmac_name.h"
#include "gap_story_vthumb.h"
diff --git a/gap/gap_story_section_properties.c b/gap/gap_story_section_properties.c
index c4f4b0c..b51740c 100644
--- a/gap/gap_story_section_properties.c
+++ b/gap/gap_story_section_properties.c
@@ -866,7 +866,7 @@ gap_story_section_spw_properties_dialog (GapStbSecpropWidget *spw)
gtk_widget_show (entry);
/* the delete button */
- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_DELETE);
+ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_DELETE);
spw->spw_delete_button = button;
gimp_help_set_help_data (button,
_("Delete storyboard section"),
diff --git a/gap/gap_story_sox.c b/gap/gap_story_sox.c
index f52c4a4..40d825f 100644
--- a/gap/gap_story_sox.c
+++ b/gap/gap_story_sox.c
@@ -21,6 +21,8 @@
#include <config.h>
+#include <stdlib.h>
+
#include <glib/gstdio.h>
#include "gap_story_sox.h"
diff --git a/gap/gap_wr_color_curve.c b/gap/gap_wr_color_curve.c
index 3aa52f6..9c966e8 100644
--- a/gap/gap_wr_color_curve.c
+++ b/gap/gap_wr_color_curve.c
@@ -849,7 +849,7 @@ p_read_curves_from_file_gimp2_6_format (const char *filename, FILE *fp, wr_curve
if (strcmp (buf, "# GIMP curves tool settings\n") != 0)
{
- printf("ERROR: file %s does not start with '%s'\n", "# GIMP curves tool settings");
+ printf("ERROR: file %s does not start with '%s'\n", filename, "# GIMP curves tool settings");
return FALSE;
}
diff --git a/gap/gimplastvaldesc.c b/gap/gimplastvaldesc.c
index c526c34..bbd4a32 100644
--- a/gap/gimplastvaldesc.c
+++ b/gap/gimplastvaldesc.c
@@ -77,7 +77,7 @@ static void p_fwrite_lines_remaining_without_keyname(FILE *fp, const char *
static void p_lastvals_register_persistent(const gchar *keyname, GimpLastvalDescType *lastval_desc_arr, gint32 argc);
-static GimpLastvalTokenTabType token_tab[GIMP_LASTVAL_END];
+static GimpLastvalTokenTabType token_tab[GIMP_LASTVAL_END + 1];
gboolean
diff --git a/libgapbase/gap_base.c b/libgapbase/gap_base.c
index a62264c..03cf3ad 100644
--- a/libgapbase/gap_base.c
+++ b/libgapbase/gap_base.c
@@ -50,6 +50,8 @@
/* GIMP includes */
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
+#include <libgimpwidgets/gimpwidgetstypes.h>
+#include <libgimpwidgets/gimphelpui.h>
#ifdef G_OS_WIN32
#include <io.h>
diff --git a/libgapvidapi/gap_vid_api.c b/libgapvidapi/gap_vid_api.c
index f6bc82a..fc0cee9 100644
--- a/libgapvidapi/gap_vid_api.c
+++ b/libgapvidapi/gap_vid_api.c
@@ -1837,6 +1837,7 @@ p_calculate_mix_threshold(gdouble threshold)
threshold = CLAMP(threshold, 0.0, 1.0);
l_threshold = (gdouble)MIX_MAX_THRESHOLD * (threshold * threshold * threshold);
l_mix_threshold = CLAMP((gint32)l_threshold, 0, MIX_MAX_THRESHOLD);
+ return l_mix_threshold;
}
diff --git a/libgapvidapi/gap_vid_api_ffmpeg.c b/libgapvidapi/gap_vid_api_ffmpeg.c
index 5eb93f7..64aec68 100644
--- a/libgapvidapi/gap_vid_api_ffmpeg.c
+++ b/libgapvidapi/gap_vid_api_ffmpeg.c
@@ -29,8 +29,9 @@
#include "avformat.h"
#include "stdlib.h"
#include "gap_val_file.h"
+#include "gap_base.h"
#include "audioconvert.h"
-
+#include "imgconvert.h"
#define READSTEPS_PROBE_TIMECODE 32
diff --git a/libgapvidapi/gap_vid_api_util.c b/libgapvidapi/gap_vid_api_util.c
index c9555f5..f1eed6c 100644
--- a/libgapvidapi/gap_vid_api_util.c
+++ b/libgapvidapi/gap_vid_api_util.c
@@ -227,9 +227,15 @@ GVA_md5_string(char *name, const char *uri)
{
guchar digest[16];
guchar n;
- gint i;
-
- gimp_md5_get_digest (uri, -1, digest);
+ GChecksum *checksum;
+ gsize len;
+ gsize i;
+
+ len = sizeof (digest);
+ checksum = g_checksum_new (G_CHECKSUM_MD5);
+ g_checksum_update (checksum, (const guchar *) uri, -1);
+ g_checksum_get_digest (checksum, digest, &len);
+ g_checksum_free (checksum);
for (i = 0; i < 16; i++)
{
diff --git a/libgapvidapi/gap_vid_api_vidindex.c b/libgapvidapi/gap_vid_api_vidindex.c
index 7bf10c7..b474bd5 100644
--- a/libgapvidapi/gap_vid_api_vidindex.c
+++ b/libgapvidapi/gap_vid_api_vidindex.c
@@ -15,6 +15,8 @@
*
*/
+#include "gap_file_util.h"
+
static char * p_build_videoindex_filename(const char *filename, gint32 track, const char *decoder_name);
static gboolean p_equal_mtime(time_t mtime_idx, time_t mtime_file);
diff --git a/libgapvidutil/gap_gve_misc_util.c b/libgapvidutil/gap_gve_misc_util.c
index faef397..56d5a3d 100644
--- a/libgapvidutil/gap_gve_misc_util.c
+++ b/libgapvidutil/gap_gve_misc_util.c
@@ -33,7 +33,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
+#include <string.h>
+#include <glib/gstdio.h>
/* GIMP includes */
#include "gtk/gtk.h"
@@ -41,6 +43,7 @@
#include "libgimp/gimp.h"
+#include "gap_image.h"
#include "gap_libgapbase.h"
#include "gap_gve_misc_util.h"
diff --git a/libgapvidutil/gap_gve_png.c b/libgapvidutil/gap_gve_png.c
index f79b8ac..fa2e843 100644
--- a/libgapvidutil/gap_gve_png.c
+++ b/libgapvidutil/gap_gve_png.c
@@ -40,12 +40,15 @@
#include <errno.h>
#include <unistd.h>
+#include <glib/gstdio.h>
+
/* GIMP includes */
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
/* GAP includes */
#include "gap_libgapbase.h"
+#include "gap_pdb_calls.h"
#include "gtk/gtk.h"
@@ -66,7 +69,7 @@ p_save_as_tmp_png_file(const char *filename, gint32 image_id, gint32 drawable_id
if(gap_debug)
{
- printf("GAP: PNG encode via call of %s on filename: %s, image_id:%d, drawable_id:%d %s\n"
+ printf("GAP: PNG encode via call of %s on filename: %s, image_id:%d, drawable_id:%d\n"
, l_called_proc
, filename
, image_id
@@ -105,7 +108,7 @@ p_save_as_tmp_png_file(const char *filename, gint32 image_id, gint32 drawable_id
, image_id
, drawable_id
, (int)return_vals[0].data.d_status
- , p_status_to_string(return_vals[0].data.d_status)
+ , gap_status_to_string(return_vals[0].data.d_status)
);
return(FALSE);
diff --git a/libgapvidutil/gap_gve_png.h b/libgapvidutil/gap_gve_png.h
index 1feb0d2..8fd4abc 100644
--- a/libgapvidutil/gap_gve_png.h
+++ b/libgapvidutil/gap_gve_png.h
@@ -23,7 +23,7 @@
app0_length: the length of the APP0-marker.
out:PNG_size: The size of the buffer that is returned.
returns: guchar *: A buffer, allocated by this routines, which contains
- the compressed PNG, NULL on error. */
+ the compressed PNG, NULL on error.
*/
guchar *gap_gve_png_drawable_encode_png(GimpDrawable *drawable, gint32 png_interlaced, gint32 *PNG_size,
diff --git a/vid_common/gap_cme_callbacks.c b/vid_common/gap_cme_callbacks.c
index a451ee4..61b93c5 100644
--- a/vid_common/gap_cme_callbacks.c
+++ b/vid_common/gap_cme_callbacks.c
@@ -45,7 +45,7 @@
static void p_start_encoder_status_poll_timer(GapCmeGlobalParams *gpp);
static void p_remove_encoder_status_poll_timer(GapCmeGlobalParams *gpp);
-static gint32 p_drop_chache_and_start_video_encoder(GapCmeGlobalParams *gpp);
+static void p_drop_chache_and_start_video_encoder(GapCmeGlobalParams *gpp);
static void on_encoder_status_poll_timer(gpointer user_data);
@@ -142,7 +142,7 @@ on_productive_encoder_start(gpointer user_data)
* p_drop_chache_and_start_video_encoder
* ----------------------------------------
*/
-static gint32
+static void
p_drop_chache_and_start_video_encoder(GapCmeGlobalParams *gpp)
{
/* delete images in the cache
diff --git a/vid_common/gap_cme_gui.c b/vid_common/gap_cme_gui.c
index 4b12932..7336ce5 100644
--- a/vid_common/gap_cme_gui.c
+++ b/vid_common/gap_cme_gui.c
@@ -53,6 +53,7 @@
#include <string.h>
#include <stdlib.h>
+#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include "gap-intl.h"
diff --git a/vid_enc_avi/gap_enc_avi_main.c b/vid_enc_avi/gap_enc_avi_main.c
index 7ef3221..fee831b 100644
--- a/vid_enc_avi/gap_enc_avi_main.c
+++ b/vid_enc_avi/gap_enc_avi_main.c
@@ -58,6 +58,7 @@
#include "gap_gve_story.h" /* for STORYBOARD support */
#include "gap_gve_jpeg.h" /* for the builtin JPEG support */
+#include "gap_gve_png.h" /* for the builtin PNG support */
#include "gap_gve_raw.h" /* for raw CODEC support */
#include "gap_gve_xvid.h" /* for XVID CODEC support */
#include "gap_enc_avi_main.h"
diff --git a/vid_enc_ffmpeg/gap_enc_ffmpeg_main.c b/vid_enc_ffmpeg/gap_enc_ffmpeg_main.c
index 9ffb980..268bd01 100644
--- a/vid_enc_ffmpeg/gap_enc_ffmpeg_main.c
+++ b/vid_enc_ffmpeg/gap_enc_ffmpeg_main.c
@@ -76,9 +76,11 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include "imgconvert.h"
#include "gap-intl.h"
+#include "gap_file_util.h"
#include "gap_libgapvidutil.h"
#include "gap_libgimpgap.h"
#include "gap_enc_ffmpeg_main.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]