}
}
- if ($width === null) {
+ if ($width === null || $width < 1) {
$width = common_config('thumbnail', 'width');
$height = common_config('thumbnail', 'height');
$crop = common_config('thumbnail', 'crop');
}
- if ($height === null) {
+ if ($height === null || $height < 1) {
$height = $width;
$crop = true;
}
+ // Debug log (convert crop to int to have TRUE being displayed as 1 and FALSE as 0)
+ common_debug('[' . __METHOD__ . ':' . __LINE__ . ']: width=' . $width . ',height=' . $height . ',crop=' . intval($crop));
+
// Get proper aspect ratio width and height before lookup
// We have to do it through an ImageFile object because of orientation etc.
// Only other solution would've been to rotate + rewrite uploaded files.
|| $box['w'] < 1 || $box['x'] >= $image->width
|| $box['h'] < 1 || $box['y'] >= $image->height) {
// Fail on bad width parameter. If this occurs, it's due to algorithm in ImageFile->scaleToFit
- common_debug("Boundary box parameters for resize of {$image->filepath} : ".var_export($box,true));
- throw new ServerException('Bad thumbnail size parameters.');
+ common_debug("Boundary box parameters for resize of {$this->filepath} : ".var_export($box,true));
+ throw new ServerException('Bad thumbnail size parameters. maxsize=' .
+ common_config('thumbnail', 'maxsize') .
+ ',box[width]=' . $box['width'] .
+ ',box[height]=' . $box['height'] .
+ ',box[w]=' . $box['w'] .
+ ',box[h]=' . $box['h'] .
+ ',box[x]=' . $box['x'] .
+ ',box[y]=' . $box['y'] .
+ ',this->width=' . $this->width .
+ ',this->heigh=' . $this->height .
+ ',this->filepath=' . $this->filepath .
+ ',this->filename=' . $this->filename
+ );
}
common_debug(sprintf('Generating a thumbnail of File id==%u of size %ux%u', $this->id, $width, $height));