[gimp/wip/dds] plug-ins: make file-dds compile.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/dds] plug-ins: make file-dds compile.
- Date: Wed, 14 Nov 2018 14:12:01 +0000 (UTC)
commit 7a66c791f16be5513f98ae7ac3296a0feb337763
Author: Jehan <jehan girinstud io>
Date: Wed Nov 14 14:56:15 2018 +0100
plug-ins: make file-dds compile.
This is still very broken and it doesn't load well. But at least it
compiles!
All build errors (and a few warnings though not all) fixed.
plug-ins/file-dds/dds.c | 10 +++++-
plug-ins/file-dds/ddsread.c | 39 ++++++++++++----------
plug-ins/file-dds/ddswrite.c | 77 +++++++++++++++++++++++---------------------
plug-ins/file-dds/mktables.c | 6 ++--
4 files changed, 76 insertions(+), 56 deletions(-)
---
diff --git a/plug-ins/file-dds/dds.c b/plug-ins/file-dds/dds.c
index 2e1f2dfe12..6f8b310623 100644
--- a/plug-ins/file-dds/dds.c
+++ b/plug-ins/file-dds/dds.c
@@ -20,6 +20,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -29,6 +31,8 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include <libgimp/stdplugins-intl.h>
+
#include "ddsplugin.h"
#include "dds.h"
#include "misc.h"
@@ -317,7 +321,11 @@ static void run(const gchar *name, gint nparams, const GimpParam *param,
}
if(dds_write_vals.gamma < 1e-04f)
- dds_write_vals.gamma = gimp_gamma();
+ /* gimp_gamma() got removed and was always returning 2.2 anyway.
+ * XXX Review this piece of code if we expect gamma value could
+ * be parameterized.
+ */
+ dds_write_vals.gamma = 2.2;
if(status == GIMP_PDB_SUCCESS)
{
diff --git a/plug-ins/file-dds/ddsread.c b/plug-ins/file-dds/ddsread.c
index cfdef9e602..e6cef40c32 100644
--- a/plug-ins/file-dds/ddsread.c
+++ b/plug-ins/file-dds/ddsread.c
@@ -28,6 +28,8 @@
**
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -38,6 +40,8 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include <libgimp/stdplugins-intl.h>
+
#include "ddsplugin.h"
#include "dds.h"
#include "dxt.h"
@@ -885,7 +889,7 @@ static int load_layer(FILE *fp, dds_header_t *hdr, dds_load_info_t *d,
g_strdup_printf("main surface %s", prefix);
layer = gimp_layer_new(image, layer_name, width, height, type, 100,
- GIMP_NORMAL_MODE);
+ GIMP_LAYER_MODE_NORMAL);
g_free(layer_name);
gimp_image_insert_layer(image, layer, 0, *l);
@@ -1206,40 +1210,41 @@ static int load_dialog(void)
dlg = gimp_dialog_new(_("Load DDS"), "dds", NULL, GTK_WIN_POS_MOUSE,
gimp_standard_help_func, LOAD_PROC,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
- gtk_signal_connect(GTK_OBJECT(dlg), "response",
- GTK_SIGNAL_FUNC(load_dialog_response),
- 0);
- gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
- GTK_SIGNAL_FUNC(gtk_main_quit),
- 0);
+ g_signal_connect(dlg, "response",
+ G_CALLBACK (load_dialog_response),
+ 0);
+ g_signal_connect(dlg, "destroy",
+ G_CALLBACK (gtk_main_quit),
+ 0);
- vbox = gtk_vbox_new(0, 8);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), vbox, 1, 1, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dlg))),
+ vbox, 1, 1, 0);
gtk_widget_show(vbox);
check = gtk_check_button_new_with_label(_("Load mipmaps"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), dds_read_vals.mipmaps);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(toggle_clicked), &dds_read_vals.mipmaps);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK (toggle_clicked), &dds_read_vals.mipmaps);
gtk_box_pack_start(GTK_BOX(vbox), check, 1, 1, 0);
gtk_widget_show(check);
check = gtk_check_button_new_with_label(_("Automatically decode YCoCg/AExp images when detected"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), dds_read_vals.decode_images);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(toggle_clicked), &dds_read_vals.decode_images);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK (toggle_clicked), &dds_read_vals.decode_images);
gtk_box_pack_start(GTK_BOX(vbox), check, 1, 1, 0);
gtk_widget_show(check);
check = gtk_check_button_new_with_label(_("Show this dialog"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), dds_read_vals.show_dialog);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(toggle_clicked), &dds_read_vals.show_dialog);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK (toggle_clicked), &dds_read_vals.show_dialog);
gtk_box_pack_start(GTK_BOX(vbox), check, 1, 1, 0);
gtk_widget_show(check);
diff --git a/plug-ins/file-dds/ddswrite.c b/plug-ins/file-dds/ddswrite.c
index 5c4ce0e31b..f86841dd66 100644
--- a/plug-ins/file-dds/ddswrite.c
+++ b/plug-ins/file-dds/ddswrite.c
@@ -20,6 +20,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,6 +33,8 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include <libgimp/stdplugins-intl.h>
+
#include "ddsplugin.h"
#include "dds.h"
#include "dxt.h"
@@ -1796,18 +1800,19 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
- gtk_signal_connect(GTK_OBJECT(dlg), "response",
- GTK_SIGNAL_FUNC(save_dialog_response),
+ g_signal_connect(dlg, "response",
+ G_CALLBACK(save_dialog_response),
0);
- gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
- GTK_SIGNAL_FUNC(gtk_main_quit),
+ g_signal_connect(dlg, "destroy",
+ G_CALLBACK(gtk_main_quit),
0);
gtk_window_set_resizable(GTK_WINDOW(dlg), 0);
- vbox = gtk_vbox_new(0, 4);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), vbox, 1, 1, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dlg))),
+ vbox, 1, 1, 0);
gtk_widget_show(vbox);
table = gtk_table_new(4, 2, 0);
@@ -1830,8 +1835,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
- gtk_signal_connect(GTK_OBJECT(opt), "changed",
- GTK_SIGNAL_FUNC(compression_selected), 0);
+ g_signal_connect(opt, "changed",
+ G_CALLBACK(compression_selected), 0);
compress_opt = opt;
@@ -1848,8 +1853,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
- gtk_signal_connect(GTK_OBJECT(opt), "changed",
- GTK_SIGNAL_FUNC(string_value_combo_selected),
+ g_signal_connect(opt, "changed",
+ G_CALLBACK(string_value_combo_selected),
&dds_write_vals.format);
gtk_widget_set_sensitive(opt, dds_write_vals.compression == DDS_COMPRESS_NONE);
@@ -1869,8 +1874,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
- gtk_signal_connect(GTK_OBJECT(opt), "changed",
- GTK_SIGNAL_FUNC(savetype_selected), &image_id);
+ g_signal_connect(opt, "changed",
+ G_CALLBACK(savetype_selected), &image_id);
string_value_combo_set_item_sensitive(opt, DDS_SAVE_CUBEMAP, is_cubemap);
string_value_combo_set_item_sensitive(opt, DDS_SAVE_VOLUMEMAP, is_volume);
@@ -1890,8 +1895,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
- gtk_signal_connect(GTK_OBJECT(opt), "changed",
- GTK_SIGNAL_FUNC(mipmaps_selected), &image_id);
+ g_signal_connect(opt, "changed",
+ G_CALLBACK(mipmaps_selected), &image_id);
string_value_combo_set_item_sensitive(opt, DDS_MIPMAP_EXISTING,
check_mipmaps(image_id, dds_write_vals.savetype));
@@ -1909,16 +1914,16 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
check = gtk_check_button_new_with_label(_("Transparent index:"));
gtk_box_pack_start(GTK_BOX(hbox), check, 0, 0, 0);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(transindex_clicked), 0);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK(transindex_clicked), 0);
gtk_widget_show(check);
spin = gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 255, 1, 1, 0)), 1, 0);
gtk_box_pack_start(GTK_BOX(hbox), spin, 1, 1, 0);
gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(spin),
GTK_UPDATE_IF_VALID);
- gtk_signal_connect(GTK_OBJECT(spin), "value_changed",
- GTK_SIGNAL_FUNC(transindex_changed), 0);
+ g_signal_connect(spin, "value_changed",
+ G_CALLBACK(transindex_changed), 0);
gtk_widget_show(spin);
g_object_set_data(G_OBJECT(check), "spin", spin);
@@ -1949,8 +1954,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
gtk_expander_set_use_markup(GTK_EXPANDER(expander), 1);
gtk_expander_set_expanded(GTK_EXPANDER(expander), dds_write_vals.show_adv_opt);
gtk_expander_set_spacing(GTK_EXPANDER(expander), 8);
- gtk_signal_connect(GTK_OBJECT(expander), "activate",
- GTK_SIGNAL_FUNC(adv_opt_expanded), 0);
+ g_signal_connect(expander, "activate",
+ G_CALLBACK(adv_opt_expanded), 0);
gtk_box_pack_start(GTK_BOX(vbox), expander, 1, 1, 0);
gtk_widget_show(expander);
@@ -1975,8 +1980,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
gtk_table_attach(GTK_TABLE(table), check, 0, 2, 0, 1,
(GtkAttachOptions)(GTK_FILL),
(GtkAttachOptions)(0), 0, 0);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(toggle_clicked), &dds_write_vals.perceptual_metric);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK(toggle_clicked), &dds_write_vals.perceptual_metric);
gtk_widget_show(check);
pm_chk = check;
@@ -2006,8 +2011,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
- gtk_signal_connect(GTK_OBJECT(opt), "changed",
- GTK_SIGNAL_FUNC(string_value_combo_selected),
+ g_signal_connect(opt, "changed",
+ G_CALLBACK(string_value_combo_selected),
&dds_write_vals.mipmap_filter);
mipmap_filter_opt = opt;
@@ -2026,8 +2031,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
- gtk_signal_connect(GTK_OBJECT(opt), "changed",
- GTK_SIGNAL_FUNC(string_value_combo_selected),
+ g_signal_connect(opt, "changed",
+ G_CALLBACK(string_value_combo_selected),
&dds_write_vals.mipmap_wrap);
mipmap_wrap_opt = opt;
@@ -2037,8 +2042,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
gtk_table_attach(GTK_TABLE(table), check, 1, 2, 2, 3,
(GtkAttachOptions)(GTK_FILL),
(GtkAttachOptions)(0), 0, 0);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(gamma_correct_clicked), NULL);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK(gamma_correct_clicked), NULL);
gtk_widget_show(check);
gamma_chk = check;
@@ -2048,8 +2053,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
gtk_table_attach(GTK_TABLE(table), check, 1, 2, 3, 4,
(GtkAttachOptions)(GTK_FILL),
(GtkAttachOptions)(0), 0, 0);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(srgb_clicked), NULL);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK(srgb_clicked), NULL);
gtk_widget_show(check);
srgb_chk = check;
@@ -2066,8 +2071,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(spin), GTK_UPDATE_IF_VALID);
- gtk_signal_connect(GTK_OBJECT(spin), "value_changed",
- GTK_SIGNAL_FUNC(gamma_changed), 0);
+ g_signal_connect(spin, "value_changed",
+ G_CALLBACK(gamma_changed), 0);
gtk_widget_show(spin);
gamma_spin = spin;
@@ -2077,8 +2082,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
gtk_table_attach(GTK_TABLE(table), check, 1, 2, 5, 6,
(GtkAttachOptions)(GTK_FILL),
(GtkAttachOptions)(0), 0, 0);
- gtk_signal_connect(GTK_OBJECT(check), "clicked",
- GTK_SIGNAL_FUNC(alpha_coverage_clicked), NULL);
+ g_signal_connect(check, "clicked",
+ G_CALLBACK(alpha_coverage_clicked), NULL);
gtk_widget_show(check);
alpha_coverage_chk = check;
@@ -2095,8 +2100,8 @@ static gint save_dialog(gint32 image_id, gint32 drawable_id)
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND), 0, 0);
gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(spin), GTK_UPDATE_IF_VALID);
- gtk_signal_connect(GTK_OBJECT(spin), "value_changed",
- GTK_SIGNAL_FUNC(alpha_test_threshold_changed), 0);
+ g_signal_connect(spin, "value_changed",
+ G_CALLBACK(alpha_test_threshold_changed), 0);
gtk_widget_show(spin);
alpha_test_threshold_spin = spin;
diff --git a/plug-ins/file-dds/mktables.c b/plug-ins/file-dds/mktables.c
index 80f5818a04..99eef6d722 100644
--- a/plug-ins/file-dds/mktables.c
+++ b/plug-ins/file-dds/mktables.c
@@ -1,13 +1,13 @@
#include <stdlib.h>
#include <stdio.h>
-int mul8bit(int a, int b)
+static int mul8bit(int a, int b)
{
int t = a * b + 128;
return((t + (t >> 8)) >> 8);
}
-int lerp13(int a, int b)
+static int lerp13(int a, int b)
{
#if 0
return(a + mul8bit(b - a, 0x55));
@@ -46,6 +46,7 @@ static void prepare_opt_table(unsigned char *tab,
}
}
+#if 0
int main(void)
{
FILE *fp;
@@ -126,3 +127,4 @@ int main(void)
return(0);
}
+#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
