head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.4 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.2 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.8.0.6 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.4 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.7.0.2 pkgsrc-2011Q1-base:1.7 pkgsrc-2009Q4:1.4.0.24 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2; locks; strict; comment @# @; 1.9 date 2012.02.04.21.10.44; author adam; state dead; branches; next 1.8; 1.8 date 2011.04.19.10.28.31; author wiz; state Exp; branches; next 1.7; 1.7 date 2011.01.24.16.51.59; author wiz; state Exp; branches; next 1.6; 1.6 date 2011.01.24.12.35.33; author wiz; state Exp; branches; next 1.5; 1.5 date 2011.01.15.16.22.11; author wiz; state Exp; branches; next 1.4; 1.4 date 2006.07.10.22.07.48; author adam; state dead; branches; next 1.3; 1.3 date 2006.06.26.21.12.53; author wiz; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 98.04.15.20.48.13; author tron; state dead; branches; next 1.1; 1.1 date 98.02.03.10.17.08; author tron; state Exp; branches; next ; 1.3.2.1 date 2006.08.01.15.10.50; author salo; state dead; branches; next ; desc @@ 1.9 log @Changes 2.6.12: Bug fixes: * GIMP 2.6.10 segfaults when CTRL-left click on a layer mask * GIMP fails to import a path from SVG * Crash or Gtk-CRITICAL on File->Open * [abrt] gimp-2:2.6.11-1.fc14: py-slice.py:172:slice:TypeError: integer argument expected, got float * gimp(1) manpage fixes * Sample Colorize does not function non-interactively * file-pdf-load: Don't use deprecated API * file-psp: fix for bogus input data * Fixes for some buffer overflow problems * Guard against crash due to quitting while DND is processed * fails to build with -Werror=format-security * script-fu: make server IPv6 aware @ text @$NetBSD: patch-af,v 1.8 2011/04/19 10:28:31 wiz Exp $ Fix build with png-1.5. https://bugzilla.gnome.org/show_bug.cgi?id=640409 --- plug-ins/common/file-png.c.orig 2010-07-13 20:22:27.000000000 +0000 +++ plug-ins/common/file-png.c @@@@ -653,7 +653,11 @@@@ on_read_error (png_structp png_ptr, png_ error_data->drawable->width, num); } +#if (PNG_LIBPNG_VER < 10500) longjmp (png_ptr->jmpbuf, 1); +#else + png_longjmp (png_ptr, 1); +#endif } /* @@@@ -697,7 +701,7 @@@@ load_image (const gchar *filename, pp = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); info = png_create_info_struct (pp); - if (setjmp (pp->jmpbuf)) + if (setjmp (png_jmpbuf(pp))) { g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Error while reading '%s'. File corrupted?"), @@@@ -738,17 +742,17 @@@@ load_image (const gchar *filename, * Latest attempt, this should be my best yet :) */ - if (info->bit_depth == 16) + if (png_get_bit_depth(pp, info) == 16) { png_set_strip_16 (pp); } - if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) + if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_GRAY && png_get_bit_depth(pp, info) < 8) { png_set_expand (pp); } - if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) + if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE && png_get_bit_depth(pp, info) < 8) { png_set_packing (pp); } @@@@ -757,8 +761,8 @@@@ load_image (const gchar *filename, * Expand G+tRNS to GA, RGB+tRNS to RGBA */ - if (info->color_type != PNG_COLOR_TYPE_PALETTE && - (info->valid & PNG_INFO_tRNS)) + if (png_get_color_type(pp, info) != PNG_COLOR_TYPE_PALETTE && + png_get_valid(pp, info, PNG_INFO_tRNS) != 0) { png_set_expand (pp); } @@@@ -775,7 +779,7 @@@@ load_image (const gchar *filename, */ if (png_get_valid (pp, info, PNG_INFO_tRNS) && - info->color_type == PNG_COLOR_TYPE_PALETTE) + png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE) { png_get_tRNS (pp, info, &alpha_ptr, &num, NULL); /* Copy the existing alpha values from the tRNS chunk */ @@@@ -797,7 +801,7 @@@@ load_image (const gchar *filename, png_read_update_info (pp, info); - switch (info->color_type) + switch (png_get_color_type(pp, info)) { case PNG_COLOR_TYPE_RGB: /* RGB */ bpp = 3; @@@@ -836,7 +840,7 @@@@ load_image (const gchar *filename, return -1; } - image = gimp_image_new (info->width, info->height, image_type); + image = gimp_image_new (png_get_image_width(pp, info), png_get_image_height(pp, info), image_type); if (image == -1) { g_set_error (error, 0, 0, @@@@ -849,7 +853,7 @@@@ load_image (const gchar *filename, * Create the "background" layer to hold the image... */ - layer = gimp_layer_new (image, _("Background"), info->width, info->height, + layer = gimp_layer_new (image, _("Background"), png_get_image_width(pp, info), png_get_image_height(pp, info), layer_type, 100, GIMP_NORMAL_MODE); gimp_image_add_layer (image, layer, 0); @@@@ -883,7 +887,7 @@@@ load_image (const gchar *filename, gimp_layer_set_offsets (layer, offset_x, offset_y); - if ((abs (offset_x) > info->width) || (abs (offset_y) > info->height)) + if ((abs (offset_x) > png_get_image_width(pp, info)) || (abs (offset_y) > png_get_image_height(pp, info))) { if (interactive) g_message (_("The PNG file specifies an offset that caused " @@@@ -938,23 +942,27 @@@@ load_image (const gchar *filename, empty = 0; /* by default assume no full transparent palette entries */ - if (info->color_type & PNG_COLOR_MASK_PALETTE) + if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) { + png_colorp palette; + int num_palette; + png_get_PLTE(pp, info, &palette, &num_palette); + if (png_get_valid (pp, info, PNG_INFO_tRNS)) { for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty) /* Calculates number of fully transparent "empty" entries */; /* keep at least one entry */ - empty = MIN (empty, info->num_palette - 1); + empty = MIN (empty, num_palette - 1); - gimp_image_set_colormap (image, (guchar *) (info->palette + empty), - info->num_palette - empty); + gimp_image_set_colormap (image, (guchar *) (palette + empty), + num_palette - empty); } else { - gimp_image_set_colormap (image, (guchar *) info->palette, - info->num_palette); + gimp_image_set_colormap (image, (guchar *) palette, + num_palette); } } @@@@ -972,18 +980,18 @@@@ load_image (const gchar *filename, */ tile_height = gimp_tile_height (); - pixel = g_new0 (guchar, tile_height * info->width * bpp); + pixel = g_new0 (guchar, tile_height * png_get_image_width(pp, info) * bpp); pixels = g_new (guchar *, tile_height); for (i = 0; i < tile_height; i++) - pixels[i] = pixel + info->width * info->channels * i; + pixels[i] = pixel + png_get_image_width(pp, info) * png_get_channels(pp, info) * i; /* Install our own error handler to handle incomplete PNG files better */ error_data.drawable = drawable; error_data.pixel = pixel; error_data.tile_height = tile_height; - error_data.width = info->width; - error_data.height = info->height; + error_data.width = png_get_image_width(pp, info); + error_data.height = png_get_image_height(pp, info); error_data.bpp = bpp; error_data.pixel_rgn = &pixel_rgn; @@@@ -996,10 +1004,10 @@@@ load_image (const gchar *filename, */ for (begin = 0, end = tile_height; - begin < info->height; begin += tile_height, end += tile_height) + begin < png_get_image_height(pp, info); begin += tile_height, end += tile_height) { - if (end > info->height) - end = info->height; + if (end > png_get_image_height(pp, info)) + end = png_get_image_height(pp, info); num = end - begin; @@@@ -1016,10 +1024,10 @@@@ load_image (const gchar *filename, gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); - memset (pixel, 0, tile_height * info->width * bpp); + memset (pixel, 0, tile_height * png_get_image_width(pp, info) * bpp); gimp_progress_update (((gdouble) pass + - (gdouble) end / (gdouble) info->height) / + (gdouble) end / (gdouble) png_get_image_height(pp, info)) / (gdouble) num_passes); } } @@@@ -1072,7 +1080,8 @@@@ load_image (const gchar *filename, { png_uint_32 proflen; - png_charp profname, profile; + png_charp profname; + png_bytep profile; int profcomp; if (png_get_iCCP (pp, info, &profname, &profcomp, &profile, &proflen)) @@@@ -1200,6 +1209,8 @@@@ save_image (const gchar *filename, guchar red, green, blue; /* Used for palette background */ time_t cutime; /* Time since epoch */ struct tm *gmt; /* GMT broken down */ + int color_type; /* type of colors in image */ + int bit_depth; /* width of colors in bit */ guchar remap[256]; /* Re-mapping for the palette */ @@@@ -1208,7 +1219,9 @@@@ save_image (const gchar *filename, if (pngvals.comment) { GimpParasite *parasite; +#ifndef PNG_iTXt_SUPPORTED gsize text_length = 0; +#endif parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment"); if (parasite) @@@@ -1249,7 +1262,7 @@@@ save_image (const gchar *filename, pp = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); info = png_create_info_struct (pp); - if (setjmp (pp->jmpbuf)) + if (setjmp (png_jmpbuf(pp))) { g_set_error (error, 0, 0, _("Error while saving '%s'. Could not save image."), @@@@ -1291,11 +1304,6 @@@@ save_image (const gchar *filename, png_set_compression_level (pp, pngvals.compression_level); - info->width = drawable->width; - info->height = drawable->height; - info->bit_depth = 8; - info->interlace_type = pngvals.interlaced; - /* * Initialise remap[] */ @@@@ -1304,44 +1312,48 @@@@ save_image (const gchar *filename, /* * Set color type and remember bytes per pixel count + * Also fix bit depths for (possibly) smaller colormap images */ + bit_depth = 8; + switch (type) { case GIMP_RGB_IMAGE: - info->color_type = PNG_COLOR_TYPE_RGB; + color_type = PNG_COLOR_TYPE_RGB; bpp = 3; break; case GIMP_RGBA_IMAGE: - info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; + color_type = PNG_COLOR_TYPE_RGB_ALPHA; bpp = 4; break; case GIMP_GRAY_IMAGE: - info->color_type = PNG_COLOR_TYPE_GRAY; + color_type = PNG_COLOR_TYPE_GRAY; bpp = 1; break; case GIMP_GRAYA_IMAGE: - info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; + color_type = PNG_COLOR_TYPE_GRAY_ALPHA; bpp = 2; break; case GIMP_INDEXED_IMAGE: + case GIMP_INDEXEDA_IMAGE: bpp = 1; - info->color_type = PNG_COLOR_TYPE_PALETTE; - info->valid |= PNG_INFO_PLTE; - info->palette = - (png_colorp) gimp_image_get_colormap (image_ID, &num_colors); - info->num_palette = num_colors; - break; + if (type == GIMP_INDEXEDA_IMAGE) + bpp = 2; - case GIMP_INDEXEDA_IMAGE: - bpp = 2; - info->color_type = PNG_COLOR_TYPE_PALETTE; - /* fix up transparency */ - respin_cmap (pp, info, remap, image_ID, drawable); + color_type = PNG_COLOR_TYPE_PALETTE; + gimp_image_get_colormap (image_ID, &num_colors); + if (num_colors <= 2) + bit_depth = 1; + else if (num_colors <= 4) + bit_depth = 2; + else if (num_colors <= 16) + bit_depth = 4; + /* otherwise the default is fine */ break; default: @@@@ -1349,19 +1361,14 @@@@ save_image (const gchar *filename, return FALSE; } - /* - * Fix bit depths for (possibly) smaller colormap images - */ + png_set_IHDR(pp, info, drawable->width, drawable->height, bit_depth, color_type, pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - if (info->valid & PNG_INFO_PLTE) + if (type == GIMP_INDEXED_IMAGE) + png_set_PLTE(pp, info, (png_colorp) gimp_image_get_colormap (image_ID, &num_colors), num_colors); + else if (type == GIMP_INDEXEDA_IMAGE) { - if (info->num_palette <= 2) - info->bit_depth = 1; - else if (info->num_palette <= 4) - info->bit_depth = 2; - else if (info->num_palette <= 16) - info->bit_depth = 4; - /* otherwise the default is fine */ + /* fix up transparency */ + respin_cmap (pp, info, remap, image_ID, drawable); } /* All this stuff is optional extras, if the user is aiming for smallest @@@@ -1477,7 +1484,7 @@@@ save_image (const gchar *filename, * Convert unpacked pixels to packed if necessary */ - if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) + if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE && png_get_bit_depth(pp, info) < 8) png_set_packing (pp); /* @@@@ -1529,7 +1536,7 @@@@ save_image (const gchar *filename, /* If we're dealing with a paletted image with * transparency set, write out the remapped palette */ - if (info->valid & PNG_INFO_tRNS) + if (png_get_valid(pp, info, PNG_INFO_tRNS)) { guchar inverse_remap[256]; @@@@ -1549,7 +1556,7 @@@@ save_image (const gchar *filename, } /* Otherwise if we have a paletted image and transparency * couldn't be set, we ignore the alpha channel */ - else if (info->valid & PNG_INFO_PLTE && bpp == 2) + else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { for (i = 0; i < num; ++i) { @@@@ -1564,7 +1571,7 @@@@ save_image (const gchar *filename, png_write_rows (pp, pixels, num); gimp_progress_update (((double) pass + (double) end / - (double) info->height) / + (double) png_get_image_height(pp, info)) / (double) num_passes); } } @ 1.8 log @Fix palette cases, after bug report from Gentoo. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.7 2011/01/24 16:51:59 wiz Exp $ @ 1.7 log @Fix previous: Due to a png documentation bug, the arguments of png_set_IHDR were swapped. Bug reported by drochner. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.6 2011/01/24 12:35:33 wiz Exp $ d240 9 a248 1 @@@@ -1309,37 +1317,34 @@@@ save_image (const gchar *filename, d276 1 d283 3 a285 3 + color_type = PNG_COLOR_TYPE_PALETTE; + png_set_PLTE(pp, info, (png_colorp) gimp_image_get_colormap (image_ID, &num_colors), num_colors); break; d287 2 a288 2 case GIMP_INDEXEDA_IMAGE: bpp = 2; d290 2 d293 8 a300 2 /* fix up transparency */ respin_cmap (pp, info, remap, image_ID, drawable); d302 10 a311 3 @@@@ -1353,17 +1358,25 @@@@ save_image (const gchar *filename, * Fix bit depths for (possibly) smaller colormap images */ d314 3 a316 3 + bit_depth = 8; + + if (png_get_valid(pp, info, PNG_INFO_PLTE)) d324 3 a326 11 + png_colorp palette; + int num_palette; + png_get_PLTE(pp, info, &palette, &num_palette); + + if (num_palette <= 2) + bit_depth = 1; + else if (num_palette <= 4) + bit_depth = 2; + else if (num_palette <= 16) + bit_depth = 4; /* otherwise the default is fine */ a328 2 + png_set_IHDR(pp, info, drawable->width, drawable->height, bit_depth, color_type, pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + d330 1 a330 3 possible file size she can turn them all off */ @@@@ -1477,7 +1490,7 @@@@ save_image (const gchar *filename, d339 1 a339 1 @@@@ -1529,7 +1542,7 @@@@ save_image (const gchar *filename, d348 1 a348 1 @@@@ -1549,7 +1562,7 @@@@ save_image (const gchar *filename, d357 1 a357 1 @@@@ -1564,7 +1577,7 @@@@ save_image (const gchar *filename, @ 1.6 log @Add upstream bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.5 2011/01/15 16:22:11 wiz Exp $ d313 1 a313 1 + png_set_IHDR(pp, info, drawable->width, drawable->height, bit_depth, color_type, PNG_FILTER_TYPE_BASE, PNG_COMPRESSION_TYPE_BASE, pngvals.interlaced ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE); @ 1.5 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d4 1 @ 1.4 log @Changes 2.2.12: - fixed display problem in the Animation Playback plug-in - fixed misbehaviour of the user installation dialog - make sure that session-managed windows are mapped completely inside a monitor - don't use long deprecated libpng API - fixed possible segfault when closing image while saving it - halt tools when the image mode changes - fixed problem in Scale and Resize widgets - fixed wrong offset in transform PDB functions - fixed bugs in the Dicom load plug-in - make sure text widgets get all key events first - fixed problems with default values in the PNG save plug-in - fixed Save As dialog not displaying the filename - fixed compilation problem with gcc 4.1 - plugged a possible buffer overrun in the XCF parser - don't save image parasites twice in XCF files @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2006/06/26 21:12:53 wiz Exp $ d3 13 a15 4 --- app/composite/gimp-composite-sse.c.orig 2005-08-15 10:07:03.000000000 +0000 +++ app/composite/gimp-composite-sse.c @@@@ -113,7 +113,7 @@@@ gimp_composite_addition_rgba8_rgba8_rgba asm("emms"); d18 217 d236 17 a252 5 +#if 0 void gimp_composite_burn_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op) { @@@@ -229,7 +229,7 @@@@ gimp_composite_burn_rgba8_rgba8_rgba8_ss d254 92 a345 4 asm("emms"); } - +#endif d347 6 a352 2 void gimp_composite_darken_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op) @ 1.3 log @Fix build with gcc4, mirroring changes in gimp-2.3.9. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @Pullup ticket 1768 - requested by ghen security update for gimp Revisions pulled up: - pkgsrc/graphics/gimp/Makefile 1.143 - pkgsrc/graphics/gimp/PLIST 1.25 - pkgsrc/graphics/gimp/buildlink3.mk 1.13 - pkgsrc/graphics/gimp/distinfo 1.30 - pkgsrc/graphics/gimp/patches/patch-aa 1.16 - pkgsrc/graphics/gimp/patches/patch-ab 1.17 - pkgsrc/graphics/gimp/patches/patch-ac removed - pkgsrc/graphics/gimp/patches/patch-ae removed - pkgsrc/graphics/gimp/patches/patch-af removed - pkgsrc/graphics/gimp/patches/patch-ag removed - pkgsrc/graphics/gimp/patches/patch-ah removed Module Name: pkgsrc Committed By: adam Date: Mon Jul 10 22:06:32 UTC 2006 Modified Files: pkgsrc/graphics/gimp: Makefile PLIST buildlink3.mk distinfo pkgsrc/graphics/gimp/patches: patch-aa patch-ab Removed Files: pkgsrc/graphics/gimp/patches: patch-ae patch-ac patch-af patch-ag patch-ah Log Message: Changes 2.2.12: - fixed display problem in the Animation Playback plug-in - fixed misbehaviour of the user installation dialog - make sure that session-managed windows are mapped completely inside a monitor - don't use long deprecated libpng API - fixed possible segfault when closing image while saving it - halt tools when the image mode changes - fixed problem in Scale and Resize widgets - fixed wrong offset in transform PDB functions - fixed bugs in the Dicom load plug-in - make sure text widgets get all key events first - fixed problems with default values in the PNG save plug-in - fixed Save As dialog not displaying the filename - fixed compilation problem with gcc 4.1 - plugged a possible buffer overrun in the XCF parser - don't save image parasites twice in XCF files @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2006/06/26 21:12:53 wiz Exp $ @ 1.2 log @Update to "gimp-0.99.26" using changes supplied by Bernd Sieker. @ text @d1 7 a7 10 --- plug-ins/gimptcl/gtcl_misc.c.orig Thu Jan 29 01:34:33 1998 +++ plug-ins/gimptcl/gtcl_misc.c Thu Jan 29 01:35:02 1998 @@@@ -29,7 +29,7 @@@@ #include #include #include -#include +#include #include #include "gtcl.h" d9 14 @ 1.1 log @Initial import of gimp-0.99.18 package made by Bernd Sieker. @ text @@