Re: DXF import

[Angus Ainslie <angusa deltatee com>]

Cyrille Chepelov wrote:

>Le Mon, Sep 09, 2002, à 05:15:38PM -0600, Angus Ainslie a écrit:
>
>Angus, 
>
>  as I previously said, if the patch doesn't apply cleanly on CVS, we will
>have trouble applying it -- you can download snapshots tarballs of the CVS
>at http://www.crans.org/~chepelov/dia if accessing the CVS server is
>unpossible to you. I hope bandwith is not a problem.
>  
>

The diff is against the latest CVS. I have no idea why it won't apply 
cleanly.

>  
>
>>diff -x Makefile -x .* -x dxf-ex* -x dxf.c -wdNu dia/plug-ins/dxf/Makefile.am dia-0.90/plug-ins/dxf/Makefile.am
>>--- dia/plug-ins/dxf/Makefile.am	Mon Sep  9 06:36:46 2002
>>+++ dia-0.90/plug-ins/dxf/Makefile.am	Wed Dec 31 17:00:00 1969
>>@@ -1,13 +0,0 @@
>>-## Process this file with automake to produce Makefile.in
>>    
>>
>
>Why does this patch completely remove plug-ins/dxf/Makefile.am ?
>
>  
>
Not on purpose. It should keep the Makefile.

>>diff -x Makefile -x .* -x dxf-ex* -x dxf.c -wdNu dia/plug-ins/dxf/autocad_pal.h dia-0.90/plug-ins/dxf/autocad_pal.h
>>--- dia/plug-ins/dxf/autocad_pal.h	Wed Dec 31 17:00:00 1969
>>+++ dia-0.90/plug-ins/dxf/autocad_pal.h	Fri Jul  5 10:24:40 2002
>>@@ -0,0 +1,265 @@
>>+typedef struct 
>>+{
>>+   unsigned char r, g, b;
>>+} RGB_t;
>>    
>>
>
>
>Huh? This file has no GPL header and no #include guards? 
>  
>
Like I said in one of my earlier posts, I don't have anymore time to 
spend on this
but I didn't want the effort to be wasted. So i decided to submit a 
working but
incomplete patch.

>  
>
>> /* reads a line entity from the dxf file and creates a line object in dia*/
>>-void read_entity_line_dxf(FILE *filedxf, DxfData *data, DiagramData *dia){
>>+Object *read_entity_line_dxf(FILE *filedxf, DxfData *data, DiagramData *dia){
>>     int codedxf;
>>    
>>
>
>[snip]
>  
>
>>@@ -185,6 +219,368 @@
>>     line_obj->ops->set_props(line_obj, props);
>> 
>>     prop_list_free(props);
>>+   
>>+   return( line_obj );
>>+}
>>    
>>
>
>This is a Good thing. 
>
>Some parts of your patch look like backports of the CVS; generally, it seems
>it goes in the right direction. I would like to apply this.
>
>	-- Cyrille
>
>  
>
Great I hope you can put it to use.

Angus