gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-176-gaabcb89)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  aabcb89e83bfbe3f601a023f8c5aa4da725a3c17 (commit)
       via  e452c5097edd72942ef02a82996dfab5651ceab3 (commit)
      from  75d03b030f4e3e491710a409bbcf18cc4a16f300 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gschem/src/o_picture.c  |    2 +-
 libgeda/src/o_picture.c |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)


=================
 Commit Messages
=================

commit aabcb89e83bfbe3f601a023f8c5aa4da725a3c17
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Jan 11 00:28:15 2009 +0000

    libgeda: Fix picture aspect ratios to compute width/height
    
    For some reason, libgeda was computing height / width, whilst gschem
    used width / height.

:100644 100644 ccd2407... b9feb70... M	libgeda/src/o_picture.c

commit e452c5097edd72942ef02a82996dfab5651ceab3
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sat Jan 10 23:50:57 2009 +0000

    gschem: Fix rubberbanding box when resizing pictures
    
    Its position was broken when changing the drawing routines to take
    world coordinates directly.

:100644 100644 00caae2... 8edcf2d... M	gschem/src/o_picture.c

=========
 Changes
=========

commit aabcb89e83bfbe3f601a023f8c5aa4da725a3c17
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Jan 11 00:28:15 2009 +0000

    libgeda: Fix picture aspect ratios to compute width/height
    
    For some reason, libgeda was computing height / width, whilst gschem
    used width / height.

diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index ccd2407..b9feb70 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -204,7 +204,7 @@ OBJECT *o_picture_read (TOPLEVEL *toplevel,
   /* The picture is described by its upper left and lower right corner */
   new_obj = o_picture_new(toplevel, pixbuf,
                           file_content, file_length, filename,
-                          (double)height/ width,
+                          (double)width / (double)height,
                           type,
                           x1, y1+height, x1+width, y1,
                           angle, mirrored, embedded);
@@ -825,7 +825,6 @@ void o_picture_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
   int height, width;
   GdkPixbuf* image = o_current->picture->original_picture;
   int img_width, img_height, img_rowstride;
-  double ratio;
   guint8 *rgb_data;
   guint8 *mask_data;
 
@@ -844,8 +843,6 @@ void o_picture_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
   rgb_data = o_picture_rgb_data(image);
   mask_data = o_picture_mask_data(image);
 
-  ratio = height/width;
-
   fprintf(fp, "gsave\n");
 
   /* color output only */

commit e452c5097edd72942ef02a82996dfab5651ceab3
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sat Jan 10 23:50:57 2009 +0000

    gschem: Fix rubberbanding box when resizing pictures
    
    Its position was broken when changing the drawing routines to take
    world coordinates directly.

diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 00caae2..8edcf2d 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -279,7 +279,7 @@ void o_picture_draw_rubber (GSCHEM_TOPLEVEL *w_current)
   width =  GET_PICTURE_WIDTH (w_current);
   height = GET_PICTURE_HEIGHT (w_current);
 
-  gschem_cairo_box (w_current, 0, left, top, left + width, top + height);
+  gschem_cairo_box (w_current, 0, left, top - height, left + width, top);
 
   gschem_cairo_set_source_color (w_current,
                                  x_color_lookup_dark (SELECT_COLOR));




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs