Commit f5e5a427 authored by Michael Stucki's avatar Michael Stucki
Browse files

* Fixed a typo in the User TSconfig reference in ext_tables_static+adt.sql

* !!! Renamed t3lib_stdGraphic->imageCreateFromGif into imageCreateFromFile. The old function will remain for providing backwards compatibility.


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@566 709f56b5-9817-0410-a4d7-c38de5d9e867
parent ee28da60
2005-02-20 Michael Stucki <michael@typo3.org>
* Fixed a typo in the User TSconfig reference in ext_tables_static+adt.sql
* !!! Renamed t3lib_stdGraphic->imageCreateFromGif into imageCreateFromFile. The old function will remain for providing backwards compatibility.
2005-02-17 Kasper Skårhøj,,, <kasper@typo3.com>
* Added 3 hooks for each hardcoded function in css_styled_content so extensions can be written which provides alternative renderings without XCLASSING.
......@@ -318,9 +323,9 @@ Sorry for writing these changelog entries with a delay of two days. I write them
* Implemented versioning API in tcemain plus other places. Still not functional for the broad public (will be in 3.8.0). Missing conceptual testing, implementation in the backend interface (still to be discussed how that is best done and fitting workflow) and not at all in the frontend.
* Tables configured for versioning by default is pages, tt_content, pages_language_overlay and sys_template
* !!!Notice that the type of integer for uid/pid fields of the above mentioned tables changed from "unsigned" to "signed". This should only mean something if you have uid/pid values over 2 billion - but then PHP will fail you anyways. So the impact should be nothing.
* !!! Notice that the type of integer for uid/pid fields of the above mentioned tables changed from "unsigned" to "signed". This should only mean something if you have uid/pid values over 2 billion - but then PHP will fail you anyways. So the impact should be nothing.
* For testers: Ask me (kasper) for the "version" extension which is my test bench and future management tool for the final implementation.
* !!!Fieldnames 't3ver_oid', 't3ver_id' and 't3ver_label' has been reserved for versioning adminstration
* !!! Fieldnames 't3ver_oid', 't3ver_id' and 't3ver_label' has been reserved for versioning adminstration
2004-08-22 Ingmar Schlecht <ingmar@typo3.org>
......@@ -731,7 +736,7 @@ Fixed bugs in Mount Points / Status:
2004-04-01 Kasper Skårhøj,,, <kasper@typo3.com>
* Added full safety for the internal TYPO3 formmail; email addresses in the fields "recipient" and "recipient_copy" are encrypted in the transfer and the "formmail" interface is safe for spam-misuse (since a proper recipient address cannot be forged automatically).
!!!If someone are using the "formmail" API from other renderers than the FORM cObject in TypoScript you will have to set the recipient address to the encrypted value by default OR alternatively disabled the check by TYPO3_CONF_VARS[FE][strictFormmail] = FALSE
!!! If someone is using the "formmail" API from other renderers than the FORM cObject in TypoScript you will have to set the recipient address to the encrypted value by default OR alternatively disabled the check by TYPO3_CONF_VARS[FE][strictFormmail] = FALSE
2004-04-01 Kasper Skårhøj,,, <kasper@typo3.com>
......
......@@ -88,7 +88,7 @@ class t3lib_formmail extends t3lib_htmlmail {
* [html_enabled]: If mail is sent as html
* [quoted_printable]: if set, quoted-printable will be used instead of base 64
*
* @param array Contains values for the field names listed above (with slashes removed if from POSt input)
* @param array Contains values for the field names listed above (with slashes removed if from POST input)
* @param boolean Whether to base64 encode the mail content
* @return void
*/
......
......@@ -337,7 +337,7 @@ class t3lib_stdGraphic {
$theMask = $tmpStr.'_mask.'.$this->gifExtension;
$theMask2 = $tmpStr.'_mask2.'.trim($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_mask_temp_ext_noloss']);
// prepare overlay image
$cpImg = $this->imageCreateFromGif($BBimage[3]);
$cpImg = $this->imageCreateFromFile($BBimage[3]);
$destImg = imagecreate($w,$h);
ImageColorAllocate($destImg, 0,0,0);
$this->copyGifOntoGif($destImg,$cpImg,$conf,$workArea);
......@@ -345,7 +345,7 @@ class t3lib_stdGraphic {
imageDestroy($cpImg);
imageDestroy($destImg);
// prepare mask image
$cpImg = $this->imageCreateFromGif($BBmask[3]);
$cpImg = $this->imageCreateFromFile($BBmask[3]);
$destImg = imagecreate($w,$h);
ImageColorAllocate($destImg, 0,0,0);
$this->copyGifOntoGif($destImg,$cpImg,$conf,$workArea);
......@@ -359,7 +359,7 @@ class t3lib_stdGraphic {
$this->combineExec($theDest,$theImage,$theMask2,$theDest);
$backIm = $this->imageCreateFromGif($theDest); // The main image is loaded again...
$backIm = $this->imageCreateFromFile($theDest); // The main image is loaded again...
if ($backIm) { // ... and if nothing went wrong we load it onto the old one.
ImageColorTransparent($backIm,-1);
$im = $backIm;
......@@ -390,7 +390,7 @@ class t3lib_stdGraphic {
$conf['BBOX']=$this->imageMagickConvert($conf['BBOX'][3],$this->gifExtension,'','','','','');
$conf['file']=$conf['BBOX'][3];
}
$cpImg = $this->imageCreateFromGif($conf['file']);
$cpImg = $this->imageCreateFromFile($conf['file']);
$this->copyGifOntoGif($im,$cpImg,$conf,$workArea);
imageDestroy($cpImg);
}
......@@ -624,7 +624,7 @@ class t3lib_stdGraphic {
$this->combineExec($fileMenu,$fileColor,$fileMask,$fileMenu);
$backIm = $this->imageCreateFromGif($fileMenu); // The main image is loaded again...
$backIm = $this->imageCreateFromFile($fileMenu); // The main image is loaded again...
if ($backIm) { // ... and if nothing went wrong we load it onto the old one.
ImageColorTransparent($backIm,-1);
$im = $backIm;
......@@ -1292,7 +1292,7 @@ class t3lib_stdGraphic {
$this->imageMagickExec($fileMask,$fileMask,$command);
$blurTextImg_tmp = $this->imageCreateFromGif($fileMask); // the mask is loaded again
$blurTextImg_tmp = $this->imageCreateFromFile($fileMask); // the mask is loaded again
if ($blurTextImg_tmp) { // if nothing went wrong we continue with the blurred mask
// cropping the border from the mask
......@@ -1322,7 +1322,7 @@ class t3lib_stdGraphic {
$this->combineExec($fileMenu,$fileColor,$fileMask,$fileMenu);
$backIm = $this->imageCreateFromGif($fileMenu); // The main image is loaded again...
$backIm = $this->imageCreateFromFile($fileMenu); // The main image is loaded again...
if ($backIm) { // ... and if nothing went wrong we load it onto the old one.
ImageColorTransparent($backIm,-1);
$im = $backIm;
......@@ -1557,7 +1557,7 @@ class t3lib_stdGraphic {
$theFile = $tmpStr.'.'.$this->gifExtension;
$this->ImageGif($im, $theFile);
$theNewFile = $this->imageMagickConvert($theFile,$this->gifExtension,$conf['width'],$conf['height'],$conf['params'],'','');
$tmpImg = $this->imageCreateFromGif($theNewFile[3]);
$tmpImg = $this->imageCreateFromFile($theNewFile[3]);
if ($tmpImg) {
ImageDestroy($im);
$im = $tmpImg;
......@@ -2494,7 +2494,7 @@ class t3lib_stdGraphic {
$theFile = $tmpStr.'.'.$this->gifExtension;
$this->ImageGif($im, $theFile);
$this->imageMagickExec($theFile,$theFile,$command);
$tmpImg = $this->imageCreateFromGif($theFile);
$tmpImg = $this->imageCreateFromFile($theFile);
if ($tmpImg) {
ImageDestroy($im);
$im = $tmpImg;
......@@ -2608,6 +2608,18 @@ class t3lib_stdGraphic {
}
}
/**
* This function has been renamed and only exists for providing backwards compatibility.
* Please use $this->imageCreateFromFile() instead.
*
* @param string Image filename
* @return pointer Image Resource pointer
* @depreciated
*/
function imageCreateFromGif($sourceImg) {
return $this->imageCreateFromFile($sourceImg);
}
/**
* Creates a new GDlib image resource based on the input image filename.
* If it fails creating a image from the input file a blank gray image with the dimensions of the input image will be created instead.
......@@ -2615,20 +2627,15 @@ class t3lib_stdGraphic {
* @param string Image filename
* @return pointer Image Resource pointer
*/
function imageCreateFromGif($sourceImg) {
function imageCreateFromFile($sourceImg) {
$imgInf = pathinfo($sourceImg);
$ext = strtolower($imgInf['extension']);
// if ($ext=='gif' && (ImageTypes() & IMG_GIF)) {
if ($ext=='gif' && function_exists('imagecreatefromgif')) {
return imageCreateFromGif($sourceImg);
}
// if ($ext=='png' && (ImageTypes() & IMG_PNG)) {
if ($ext=='png' && function_exists('imagecreatefrompng')) {
} elseif ($ext=='png' && function_exists('imagecreatefrompng')) {
return imageCreateFromPng($sourceImg);
}
// if (($ext=='jpg' || $ext=='jpeg') && (ImageTypes() & IMG_JPG)) {
if (($ext=='jpg' || $ext=='jpeg') && function_exists('imagecreatefromjpeg')) {
} elseif (($ext=='jpg' || $ext=='jpeg') && function_exists('imagecreatefromjpeg')) {
return imageCreateFromJpeg($sourceImg);
}
......
......@@ -242,7 +242,7 @@ class tx_indexed_search_extparse {
case 'xml': // Generic XML
case 'jpg': // Jpeg images (EXIF comment)
case 'jpeg': // Jpeg images (EXIF comment)
case 'tif': // TIf images (EXIT comment)
case 'tif': // TIF images (EXIF comment)
return TRUE;
break;
}
......
......@@ -2803,7 +2803,7 @@ From sub-directory:
$imageProc->IM_commands=array();
$input = t3lib_extMgm::extPath("install")."imgs/jesus.".$imageProc->gifExtension;
if (!@is_file($input)) die("Error: ".$input." was not a file");
$im = $imageProc->imageCreateFromGif($input);
$im = $imageProc->imageCreateFromFile($input);
$workArea=array(0,0,170,136);
$conf=array();
$conf["dimensions"]="10,50,150,36";
......
......@@ -387,7 +387,7 @@ class SC_wizard_colorpicker {
if (!$this->imageError) {
if ($this->pickerImage) {
if(t3lib_div::_POST('coords_x')) {
$this->colorValue = '#'.$this->getIndex(t3lib_stdgraphic::imageCreateFromGif($this->pickerImage),t3lib_div::_POST('coords_x'),t3lib_div::_POST('coords_y'));
$this->colorValue = '#'.$this->getIndex(t3lib_stdgraphic::imageCreateFromFile($this->pickerImage),t3lib_div::_POST('coords_x'),t3lib_div::_POST('coords_y'));
}
$pickerFormImage = '
<p class="c-head">'.$LANG->getLL('colorpicker_fromImage',1).'</p>
......@@ -407,7 +407,7 @@ class SC_wizard_colorpicker {
* Gets the HTML (Hex) Color Code for the selected pixel of an image
* This method handles the correct imageResource no matter what format
*
* @param pointer Valid ImageResource returned by t3lib_stdgraphic::imageCreateFromGif
* @param pointer Valid ImageResource returned by t3lib_stdgraphic::imageCreateFromFile
* @param integer X-Coordinate of the pixel that should be checked
* @param integer Y-Coordinate of the pixel that should be checked
* @return string HEX RGB value for color
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment