[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: f_image.c
User: cnieves
Date: 06/09/22 14:48:08
Modified: . f_image.c o_arc_basic.c o_box_basic.c o_bus_basic.c
o_circle_basic.c o_image.c o_line_basic.c
o_net_basic.c o_pin_basic.c s_color.c s_cue.c
Log:
Use gd 2.0.x library instead of libgdgeda.
libgdgeda is not used anymore. Work based on a patch by
Wojciech Kazubski (patch #1479983).
Revision Changes Path
1.19 +6 -7 eda/geda/gaf/libgeda/src/f_image.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: f_image.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/f_image.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- f_image.c 5 Jul 2006 03:13:38 -0000 1.18
+++ f_image.c 22 Sep 2006 18:48:07 -0000 1.19
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -40,7 +40,7 @@
#include <dmalloc.h>
#endif
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
/*! \todo Finish function description!!!
* \brief
* \par Function Description
@@ -73,7 +73,6 @@
while ( o_current != NULL ) {
if (o_current->type != OBJ_HEAD) {
-
switch (o_current->type) {
case(OBJ_LINE):
o_line_image_write(w_current, o_current,
@@ -179,7 +178,7 @@
int color_mode)
{
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
int origin_x, origin_y, bottom, right;
float scale=0.0;
@@ -203,8 +202,8 @@
o_image_write(filename);
o_image_close();
#else
- fprintf(stderr, "f_image_write: Called this function without libgdgeda support.\n");
- s_log_message("f_image_write: Called this function without libgdgeda support.\n");
+ fprintf(stderr, "f_image_write: Called this function without libgd support.\n");
+ s_log_message("f_image_write: Called this function without libgd support.\n");
#endif
}
1.29 +5 -5 eda/geda/gaf/libgeda/src/o_arc_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_arc_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_arc_basic.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- o_arc_basic.c 15 Jul 2006 17:00:51 -0000 1.28
+++ o_arc_basic.c 22 Sep 2006 18:48:07 -0000 1.29
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -1549,7 +1549,7 @@
/*! \brief Draw an arc in an image.
* \par Function Description
- * This function draws an arc in an image with the libgdgeda function <B>gdImageArc()</B>.
+ * This function draws an arc in an image with the libgd function <B>gdImageArc()</B>.
*
* \param [in] w_current The TOPLEVEL object.
* \param [in] o_current
@@ -1624,7 +1624,7 @@
x = o_current->arc->screen_x;
y = o_current->arc->screen_y;
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
gdImageSetThickness(current_im_ptr, SCREENabs(w_current,
o_current->line_width));
1.24 +4 -4 eda/geda/gaf/libgeda/src/o_box_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_box_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_box_basic.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- o_box_basic.c 15 Jul 2006 17:00:51 -0000 1.23
+++ o_box_basic.c 22 Sep 2006 18:48:07 -0000 1.24
@@ -23,8 +23,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -1659,7 +1659,7 @@
/*! \brief Draw a box in an image.
* \par Function Description
- * This function draws a box in an image with the libgdgeda function
+ * This function draws a box in an image with the libgd function
* #gdImageRectangle().
*
* \param [in] w_current The TOPLEVEL object.
@@ -1687,7 +1687,7 @@
}
/* assumes screen coords are already calculated correctly */
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
gdImageSetThickness(current_im_ptr, SCREENabs(w_current,
o_current->line_width));
1.15 +3 -3 eda/geda/gaf/libgeda/src/o_bus_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_bus_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_bus_basic.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- o_bus_basic.c 15 Jul 2006 17:00:51 -0000 1.14
+++ o_bus_basic.c 22 Sep 2006 18:48:07 -0000 1.15
@@ -26,8 +26,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -513,7 +513,7 @@
y2 = o_current->line->screen_y[1];
/* assumes screen coords are already calculated correctly */
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
gdImageSetThickness(current_im_ptr, SCREENabs(w_current, BUS_WIDTH));
1.25 +4 -4 eda/geda/gaf/libgeda/src/o_circle_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_circle_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_circle_basic.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- o_circle_basic.c 15 Jul 2006 17:00:51 -0000 1.24
+++ o_circle_basic.c 22 Sep 2006 18:48:07 -0000 1.25
@@ -23,8 +23,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -1383,7 +1383,7 @@
/*! \brief Draw a circle in an image.
* \par Function Description
- * This function draws a circle in an image with the libgdgeda function
+ * This function draws a circle in an image with the libgd function
* #gdImageArc().
*
* \param [in] w_current The TOPLEVEL object.
@@ -1408,7 +1408,7 @@
color = image_black;
}
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
gdImageSetThickness(current_im_ptr, SCREENabs(w_current,
o_current->line_width));
1.20 +4 -4 eda/geda/gaf/libgeda/src/o_image.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_image.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_image.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- o_image.c 5 Jul 2006 03:13:38 -0000 1.19
+++ o_image.c 22 Sep 2006 18:48:07 -0000 1.20
@@ -23,8 +23,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -51,7 +51,7 @@
int image_grey;
#endif
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
extern COLOR colors[MAX_COLORS];
@@ -148,7 +148,7 @@
* \par Function Description
*
*/
-/* this can stay in even if libgdgeda doesn't exist */
+/* this can stay in even if libgd doesn't exist */
int o_image_geda2gd_color(int color)
{
int value;
1.24 +4 -4 eda/geda/gaf/libgeda/src/o_line_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_line_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_line_basic.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- o_line_basic.c 15 Jul 2006 17:00:51 -0000 1.23
+++ o_line_basic.c 22 Sep 2006 18:48:07 -0000 1.24
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -1410,7 +1410,7 @@
/*! \brief Draw a line in an image.
* \par Function Description
- * This function draws a line in an image with the libgdgeda function
+ * This function draws a line in an image with the libgd function
* #gdImageLine().
*
* \param [in] w_current The TOPLEVEL object.
@@ -1437,7 +1437,7 @@
}
/* assumes screen coords are already calculated correctly */
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
gdImageSetThickness(current_im_ptr, SCREENabs(w_current,
o_current->line_width));
1.31 +3 -3 eda/geda/gaf/libgeda/src/o_net_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_net_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_net_basic.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- o_net_basic.c 15 Jul 2006 17:00:51 -0000 1.30
+++ o_net_basic.c 22 Sep 2006 18:48:07 -0000 1.31
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -540,7 +540,7 @@
y2 = o_current->line->screen_y[1];
/* assumes screen coords are already calculated correctly */
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
if (w_current->net_style == THICK) {
gdImageSetThickness(current_im_ptr, SCREENabs(w_current,
1.23 +3 -3 eda/geda/gaf/libgeda/src/o_pin_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_pin_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_pin_basic.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- o_pin_basic.c 15 Jul 2006 17:00:51 -0000 1.22
+++ o_pin_basic.c 22 Sep 2006 18:48:07 -0000 1.23
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <libguile.h>
-#ifdef HAS_LIBGDGEDA
-#include <gdgeda/gd.h>
+#ifdef HAS_LIBGD
+#include <gd.h>
#endif
#include "defines.h"
@@ -508,7 +508,7 @@
}
/* assumes screen coords are already calculated correctly */
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
if (w_current->pin_style == THICK) {
gdImageSetThickness(current_im_ptr, SCREENabs(w_current,
1.10 +1 -1 eda/geda/gaf/libgeda/src/s_color.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_color.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/s_color.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- s_color.c 15 Jul 2006 17:00:51 -0000 1.9
+++ s_color.c 22 Sep 2006 18:48:07 -0000 1.10
@@ -179,7 +179,7 @@
if (colors[i].image_red != -1 && colors[i].image_green != -1 &&
colors[i].image_blue != -1) {
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
colors[i].image_color = gdImageColorAllocate(
current_im_ptr,
colors[i].image_red,
1.5 +5 -5 eda/geda/gaf/libgeda/src/s_cue.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_cue.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/s_cue.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- s_cue.c 5 Jul 2006 03:13:38 -0000 1.4
+++ s_cue.c 22 Sep 2006 18:48:07 -0000 1.5
@@ -96,7 +96,7 @@
fprintf(fp, "fill\n");
}
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
/*! \todo Finish function documentation!!!
* \brief
* \par Function Description
@@ -265,7 +265,7 @@
if (count < 1) { /* Didn't find anything connected there */
if (output_type == POSTSCRIPT) {
s_cue_postscript_fillbox(w_current, fp, x, y);
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
} else if (output_type == PNG) {
s_cue_image_fillbox(w_current, object, x, y);
#endif
@@ -279,7 +279,7 @@
} else {
s_cue_postscript_fillcircle(w_current, fp, x, y, TRUE);
}
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
} else if (output_type == PNG) {
if (!bus_involved) {
s_cue_image_fillcircle(w_current, x, y, FALSE);
@@ -299,7 +299,7 @@
} else {
s_cue_postscript_fillcircle(w_current, fp, x, y, TRUE);
}
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
} else if (output_type == PNG) {
if (!bus_involved) {
s_cue_image_fillcircle(w_current, x, y, FALSE);
@@ -348,7 +348,7 @@
if (output_type == POSTSCRIPT) {
s_cue_postscript_fillcircle(w_current, fp, x, y, size_flag);
-#ifdef HAS_LIBGDGEDA
+#ifdef HAS_LIBGD
} else if (output_type == PNG) {
s_cue_image_fillcircle(w_current, x, y, size_flag);
#endif
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs