pike.git/ src/ modules/ SANE/ sane.c

2000-07-07

2000-07-07 16:10:07 by Marcus Comstedt <marcus@mc.pp.se>

• 22cfb3ec19f8d4e4c7aced72a1ccf9e97ec2e09d (13 lines) (+7/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

fp ==> Pike_fp

Rev: src/modules/Mysql/mysql.c:1.34
Rev: src/modules/Mysql/precompiled_mysql.h:1.8
Rev: src/modules/SANE/sane.c:1.5

29:      #include "../Image/image.h"    - RCSID("$Id: sane.c,v 1.4 2000/03/02 19:22:23 per Exp $"); + RCSID("$Id: sane.c,v 1.5 2000/07/07 16:10:07 marcus Exp $");      /*   **! module SANE
38:   **! library from pike   **!   **! note - **! $Id: sane.c,v 1.4 2000/03/02 19:22:23 per Exp $ + **! $Id: sane.c,v 1.5 2000/07/07 16:10:07 marcus Exp $   */      static int sane_is_inited;
108:    }   }    - #define THIS ((struct scanner *)fp->current_storage) + #define THIS ((struct scanner *)Pike_fp->current_storage)      static void push_option_descriptor( const SANE_Option_Descriptor *o )   {
527:    THREADS_DISALLOW();    ref_push_object( o );    push_int( i ); -  ref_push_object( fp->current_object ); +  ref_push_object( Pike_fp->current_object );    apply_svalue( sp-args-3, 3 );    pop_stack();    }
650:    push_int( p.pixels_per_line );    push_int( 1 );    rsp->o = clone_object( image_program, 2 ); -  rsp->t = fp->current_object; -  fp->current_object->refs++; +  rsp->t = Pike_fp->current_object; +  Pike_fp->current_object->refs++;    rsp->r = ((struct image *)rsp->o->storage)->img;    rsp->h = THIS->h;    rsp->p = p;