Branch: Tag:

2000-12-10

2000-12-10 04:30:23 by Per Hedbor <ph@opera.com>

Works with non-layered images again

Rev: server/modules/graphics/cimg.pike:1.34

7:      roxen.ImageCache the_cache;    - constant cvs_version = "$Id: cimg.pike,v 1.33 2000/12/05 00:39:53 nilsson Exp $"; + constant cvs_version = "$Id: cimg.pike,v 1.34 2000/12/10 04:30:23 per Exp $";   constant module_type = MODULE_TAG;   constant module_name = "Image converter";   constant module_doc = "Provides the tag <tt>&lt;cimg&gt;</tt> that can be used "
138:    else    layers = roxen.load_layers( args->src, id, opts );    +  layers->set_misc_value( "visible",1 ); +  foreach( layers, Image.Layer lay ) +  if( !lay->get_misc_value( "name" ) ) +  lay->set_misc_value( "name", "Background" );       if( args["exclude-layers"] )    {
254:    {    mapping a = get_my_args( check_args( args ), id );    args -= a; -  args->src = query_absolute_internal_location(id)+the_cache->store( a,id ); +  args->src=query_absolute_internal_location(id)+the_cache->store( a,id );    if( mapping size = the_cache->metadata( a, id, 1 ) )    {    // image in cache (1 above prevents generation on-the-fly)