WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libs-dev/libimg/scale.asm

 ;; If not, see .                                                    ;;
 ;;                                                                                                ;;
 ;;================================================================================================;;
 ;;================================================================================================;;
-proc img.scale _src, _crop_x, _crop_y, _crop_width, _crop_height, _dst, _scale_type, _scale_alg, _param1, _param2 ;;
+proc img.scale _src, _crop_x, _crop_y, _crop_width, _crop_height, _dst, _scale, _inter, _param1, _param2 ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? scale _image                                                                                   ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> [_src]         = pointer to source image                                                       ;;
 ;> [_crop_x]      = left coord of cropping rect                                                   ;;
 ;> [_crop_y]      = top coord of cropping rect                                                    ;;
 ;> [_crop_width]  = width of cropping rect                                                        ;;
 ;> [_crop_height] = height of cropping rect                                                       ;;
 ;> [_dst]         = pointer to resulting image / 0                                                ;;
-;> [_scale_type]  = how to change width and height. see libimg.inc                                ;;
+;> [_scale]       = how to change width and height. see libimg.inc                                ;;
-;> [_scale_alg]   = algorithm to use. see libimg.inc                                              ;;
+;> [_inter]       = interpolation algorithm                                                       ;;
-;> [_param1]      = the first argument passed to _scale_alg algorithm                             ;;
+;> [_param1]      = see libimg.inc                                                                ;;
-;> [_param2]      = the second argument passed to _scale_alg algorithm                            ;;
+;> [_param2]      = see libimg.inc                                                                ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< eax = 0 / pointer to scaled image                                                              ;;
 ;< ecx = error code / undefined                                                                   ;;
 ;;================================================================================================;;
 	src_width_pixels	rd 1
 	src_width_bytes		rd 1
 	src_height_pixels	rd 1
-	scl_width_pixels	rd 1
+	dst_width_pixels	rd 1
-	scl_width_pixels_inv	rd 1
+	dst_width_pixels_inv	rd 1
-	scl_height_pixels	rd 1
+	dst_height_pixels	rd 1
-	scl_height_pixels_inv	rd 1
+	dst_height_pixels_inv	rd 1
-	scl_width_bytes		rd 1
+	dst_width_bytes		rd 1
 	bytes_per_pixel		rd 1
     @@:
 	cmp	eax, Image.bpp24
 	jne	@f
 	mov	[bytes_per_pixel], 3
 	lea	ecx, [ecx*3]
-	lea	edx, [ecx*3]
+	lea	edx, [edx*3]
 	jmp	.lab1
     @@:
 	cmp	eax, Image.bpp8g
 	jne	@f
 	mov	[bytes_per_pixel], 1
   .lab1:
 	mov	[src_width_bytes], ecx
 	add	[src_data], edx
+	mov	eax, [_scale]
+	cmp	eax, LIBIMG_SCALE_INTEGER
+	je	.scale_type.integer
+	cmp	eax, LIBIMG_SCALE_TILE
+	je	.scale_type.tile
+	cmp	eax, LIBIMG_SCALE_FIT_RECT
+	je	.scale_type.fit_rect
+	cmp	eax, LIBIMG_SCALE_FIT_WIDTH
+	je	.scale_type.fit_width
+	cmp	eax, LIBIMG_SCALE_FIT_HEIGHT
+	je	.scale_type.fit_height
+	cmp	eax, LIBIMG_SCALE_FIT_MAX
+	je	.scale_type.fit_max
+	cmp	eax, LIBIMG_SCALE_STRETCH
+	je	.scale_type.stretch
+	mov	ecx, LIBIMG_ERROR_SCALE
+	jmp	.error
-	mov	eax, [_scale_alg]
+  .scale_type.integer:
+	jmp	.integer
+  .scale_type.tile:
+	jmp	.tile
+  .scale_type.fit_rect:
+	mov	eax, [_param1]
+	shl	eax, 16
+	add	eax, 0x00008000
+	xor	edx, edx
+	div	[src_width_pixels]
+	mov	ebx, eax
+	mov	eax, [_param2]
+	shl	eax, 16
+	add	eax, 0x00008000
+	xor	edx, edx
+	div	[src_height_pixels]
+	mov	ecx, eax
+	cmp	ebx, ecx
+	jb	@f
+	mov	ebx, ecx
+    @@:
+	jmp	.scale_type.fit_common
+  .scale_type.fit_max:
+	mov	eax, [_param1]
+	shl	eax, 16
+	add	eax, 0x00008000
+	xor	edx, edx
+	div	[src_width_pixels]
+	mov	ebx, eax
+	mov	eax, [_param2]
+	shl	eax, 16
+	add	eax, 0x00008000
+	xor	edx, edx
+	div	[src_height_pixels]
+	mov	ecx, eax
+	cmp	ebx, ecx
+	ja	@f
+	mov	ebx, ecx
+    @@:
+	jmp	.scale_type.fit_common
+  .scale_type.fit_width:
+	mov	eax, [_param1]
+	shl	eax, 16
+	add	eax, 0x00008000
+	xor	edx, edx
+	div	[src_width_pixels]
+	mov	ebx, eax
+	jmp	.scale_type.fit_common
+  .scale_type.fit_height:
+	mov	eax, [_param2]
+	shl	eax, 16
+	add	eax, 0x00008000
+	xor	edx, edx
+	div	[src_height_pixels]
+	mov	ebx, eax
+	jmp	.scale_type.fit_common
+  .scale_type.fit_common:
+	mov	eax, [src_width_pixels]
+	mul	ebx
+	shr	eax, 16
+	mov	[dst_width_pixels], eax
+	imul	eax, [bytes_per_pixel]
+	mov	[dst_width_bytes], eax
+	mov	eax, [src_height_pixels]
+	mul	ebx
+	shr	eax, 16
+	mov	[dst_height_pixels], eax
+	jmp	.define_inter
+  .scale_type.stretch:
+	mov	eax, [_param1]
+	mov	[dst_width_pixels], eax
+	imul	eax, [bytes_per_pixel]
+	mov	[dst_width_bytes], eax
+	mov	ecx, [_param2]
+	mov	[dst_height_pixels], ecx
+	jmp	.define_inter
-	cmp	eax, LIBIMG_SCALE_ALG_INTEGER
+  .define_inter:
-	je	.integer
+	mov	eax, [_inter]
-	cmp	eax, LIBIMG_SCALE_ALG_BILINEAR
+	cmp	eax, LIBIMG_INTER_BILINEAR
 	je	.bilinear
+	mov	ecx, LIBIMG_ERROR_INTER
-	mov	ecx, LIBIMG_ERROR_SCALE_ALG
+	jmp	.error
 	jmp	.error
   .integer:
 	mov	eax, [_param1]
 	mov	ecx, [_crop_width]
 	imul	ecx, eax
-	mov	[scl_width_pixels], ecx
+	mov	[dst_width_pixels], ecx
 	mov	edx, [_crop_height]
 	imul	edx, eax
-	mov	[scl_height_pixels], edx
+	mov	[dst_height_pixels], edx
 	mov	eax, [_dst]
 	test	eax, eax
 	jnz	@f
-	stdcall	img.create, [scl_width_pixels], [scl_height_pixels], [src_type]
+	stdcall	img.create, [dst_width_pixels], [dst_height_pixels], [src_type]
 	test	eax, eax
 	je	.integer.bpp32
 	mov	ecx, LIBIMG_ERROR_BIT_DEPTH
 	jmp	.error
   .integer.bpp8g:
-	push	[scl_width_pixels]
+	push	[dst_width_pixels]
-	pop	[scl_width_bytes]
+	pop	[dst_width_bytes]
 	mov	ecx, [_param1]
 ;	cmp	ecx, 1
 ;	je	.error
   .integer.bpp8g.common:
 	rep	stosb
 	dec	ebx
 	jnz	@b
 	push	esi
 	mov	esi, edi
-	sub	esi, [scl_width_bytes]
+	sub	esi, [dst_width_bytes]
 	mov	ecx, edx
 	dec	ecx
-	imul	ecx, [scl_width_bytes]
+	imul	ecx, [dst_width_bytes]
 	mov	eax, ecx
 	shr	ecx, 2
 	and	eax, 0x00000003
 	rep	movsd
 	mov	ecx, eax
 	jnz	.integer.bpp8g.common.line
 	mov	eax, [_dst]
 	jmp	.quit
   .integer.bpp24:
-	mov	eax, [scl_width_pixels]
+	mov	eax, [dst_width_pixels]
 	lea	eax, [eax*3]
-	mov	[scl_width_bytes], eax
+	mov	[dst_width_bytes], eax
 	mov	ecx, [_param1]
 ;	cmp	ecx, 1
 ;	je	.error
   .integer.bpp24.common:
 	pop	esi
 	dec	ebx
 	jnz	@b
 	push	esi
 	mov	esi, edi
-	sub	esi, [scl_width_bytes]
+	sub	esi, [dst_width_bytes]
 	mov	ecx, edx
 	dec	ecx
-	imul	ecx, [scl_width_bytes]
+	imul	ecx, [dst_width_bytes]
 	mov	eax, ecx
 	shr	ecx, 2
 	and	eax, 0x00000003
 	rep	movsd
 	mov	ecx, eax
 	jnz	.integer.bpp24.common.line
 	mov	eax, [_dst]
 	jmp	.quit
   .integer.bpp32:
-	mov	eax, [scl_width_pixels]
+	mov	eax, [dst_width_pixels]
 	shl	eax, 2
-	mov	[scl_width_bytes], eax
+	mov	[dst_width_bytes], eax
 	mov	ecx, [_param1]
 ;	cmp	ecx, 1
 ;	je	.error
   .integer.bpp32.common:
 	rep	stosd
 	dec	ebx
 	jnz	@b
 	push	esi
 	mov	esi, edi
-	sub	esi, [scl_width_bytes]
+	sub	esi, [dst_width_bytes]
 	mov	ecx, edx
 	dec	ecx
-	imul	ecx, [scl_width_bytes]
+	imul	ecx, [dst_width_bytes]
 	shr	ecx, 2
 	rep	movsd
 	pop	esi
 	mov	eax, [src_width_pixels]
 	sub	eax, [_crop_width]
 	jnz	.integer.bpp32.common.line
 	mov	eax, [_dst]
 	jmp	.quit
-  .bilinear:
-	mov	eax, [_scale_type]
-	cmp	eax, LIBIMG_SCALE_TYPE_FIT_RECT
-	je	.bilinear.fit_rect
-	cmp	eax, LIBIMG_SCALE_TYPE_FIT_WIDTH
-	je	.bilinear.fit_width
-	cmp	eax, LIBIMG_SCALE_TYPE_FIT_HEIGHT
-	je	.bilinear.fit_height
-	cmp	eax, LIBIMG_SCALE_TYPE_FIT_MAX
-	je	.bilinear.fit_max
-	cmp	eax, LIBIMG_SCALE_TYPE_STRETCH
-	je	.bilinear.stretch
-	mov	ecx, LIBIMG_ERROR_SCALE_TYPE
 	jmp	.error
-  .bilinear.fit_rect:
-	mov	eax, [_param1]
-	shl	eax, 16
+  .tile:
-	add	eax, 0x00008000
+	mov	eax, [_param1]
-	xor	edx, edx
+	mov	[dst_width_pixels], eax
-	div	[src_width_pixels]
+	imul	eax, [bytes_per_pixel]
-	mov	ebx, eax
+	mov	[dst_width_bytes], eax
+	mov	eax, [_param2]
-	mov	eax, [_param2]
+	mov	[dst_height_pixels], eax
-	shl	eax, 16
-	add	eax, 0x00008000
-	xor	edx, edx
+	mov	eax, [_dst]
+	test	eax, eax
-	div	[src_height_pixels]
+	jnz	@f
-	mov	ecx, eax
+	stdcall	img.create, [dst_width_pixels], [dst_height_pixels], [src_type]
-	cmp	ebx, ecx
+	test	eax, eax
-	jb	@f
+	jz	.error
-	mov	ebx, ecx
-    @@:
-	jmp	.bilinear.fit_common
+	mov	[_dst], eax
-  .bilinear.fit_max:
-	mov	eax, [_param1]
-	shl	eax, 16
+    @@:
-	add	eax, 0x00008000
+	mov	edi, [eax + Image.Data]
-	xor	edx, edx
+	mov	[dst_data], edi
-	div	[src_width_pixels]
-	mov	ebx, eax
-	mov	eax, [_param2]
-	shl	eax, 16
-	add	eax, 0x00008000
+	mov	esi, [src_data]
-	xor	edx, edx
-	div	[src_height_pixels]
-	mov	ecx, eax
+	mov	eax, [_crop_height]
-	cmp	ebx, ecx
+	cmp	eax, [dst_height_pixels]
-	ja	@f
+	jna	@f
-	mov	ebx, ecx
-    @@:
-	jmp	.bilinear.fit_common
-  .bilinear.fit_width:
+	mov	eax, [dst_height_pixels]
-	mov	eax, [_param1]
-	shl	eax, 16
-	add	eax, 0x00008000
-	xor	edx, edx
-	div	[src_width_pixels]
-	mov	ebx, eax
-	jmp	.bilinear.fit_common
+    @@:
-  .bilinear.fit_height:
-	mov	eax, [_param2]
-	shl	eax, 16
-	add	eax, 0x00008000
+	push	eax
-	xor	edx, edx
+	mov	ecx, [_crop_width]
-	div	[src_height_pixels]
-	mov	ebx, eax
-	jmp	.bilinear.fit_common
+	cmp	ecx, [dst_width_pixels]
-  .bilinear.fit_common:
+	jna	@f
-	mov	eax, [src_width_pixels]
-	mul	ebx
-	shr	eax, 16
+	mov	ecx, [dst_width_pixels]
-	mov	[scl_width_pixels], eax
-	imul	eax, [bytes_per_pixel]
-	mov	[scl_width_bytes], eax
-	mov	eax, [src_height_pixels]
+    @@:
-	mul	ebx
-	shr	eax, 16
-	mov	[scl_height_pixels], eax
+	imul	ecx, [bytes_per_pixel]
-	jmp	.bilinear.common
-  .bilinear.stretch:
-	mov	eax, [_param1]
-	mov	[scl_width_pixels], eax
-	imul	eax, [bytes_per_pixel]
+	mov	edx, ecx
-	mov	[scl_width_bytes], eax
-	mov	ecx, [_param2]
+    @@:
+	mov	ecx, edx
+	rep	movsb
+	push	esi
+	mov	esi, edi
+	sub	esi, edx
+	mov	ecx, [dst_width_bytes]
+	sub	ecx, edx
+	rep	movsb
+	pop	esi
+	mov	ecx, [src_width_bytes]
+	sub	ecx, edx
+	add	esi, ecx
+	dec	eax
+	jnz	@b
+	pop	eax
+	mov	esi, [dst_data]
+	mov	ecx, [dst_height_pixels]
+	sub	ecx, eax
+	imul	ecx, [dst_width_bytes]
+	rep	movsb
+	mov	eax, [_dst]
-	mov	[scl_height_pixels], ecx
+	jmp	.quit
 	jmp	.bilinear.common
-  .bilinear.common:
+  .bilinear:
 	mov	eax, [_dst]
 	test	eax, eax
 	jnz	@f
-	stdcall	img.create, [scl_width_pixels], [scl_height_pixels], [src_type]
+	stdcall	img.create, [dst_width_pixels], [dst_height_pixels], [src_type]
 	test	eax, eax
 	jz	.error
 	pop	[crop_height_pixels_m1]
 	sub	[crop_height_pixels_m1], 1
 	mov	eax, 0xffffffff
 	xor	edx, edx
-	div	[scl_width_pixels]
+	div	[dst_width_pixels]
-	mov	[scl_width_pixels_inv], eax
+	mov	[dst_width_pixels_inv], eax
 	mov	eax, 0xffffffff
 	xor	edx, edx
-	div	[scl_height_pixels]
+	div	[dst_height_pixels]
-	mov	[scl_height_pixels_inv], eax
+	mov	[dst_height_pixels_inv], eax
 	mov	eax, [src_type]
 	cmp	eax, Image.bpp8g
   .bilinear.bpp8g.line:
 	mov	esi, [src_data]
 	mov	[dst_x], 0
 	imul	eax, [crop_height_pixels_m1]
 	xor	edx, edx
-	div	[scl_height_pixels]
+	div	[dst_height_pixels]
 	mov	[rem_y], edx
 	imul	eax, [src_width_bytes]
 	add	esi, eax
 	mov	[src_base], esi
 	mov	eax, 0	; mov eax, [dst_x]
   .bilinear.bpp8g.pixel:
 	mov	esi, [src_base]
 	imul	eax, [crop_width_pixels_m1]
 	xor	edx, edx
-	div	[scl_width_pixels]
+	div	[dst_width_pixels]
 	add	esi, eax
 	mov	ax, word[esi]
 	and	ebx, 0x000000ff
 	imul	edx, esi
 	imul	ecx, esi
 	neg	esi
-	add	esi, [scl_width_pixels]
+	add	esi, [dst_width_pixels]
 	imul	eax, esi
 	imul	ebx, esi
 	add	eax, edx
 	add	ebx, ecx
-	mov	esi, [scl_width_pixels_inv]
+	mov	esi, [dst_width_pixels_inv]
 	mul	esi
 	mov	ecx, edx
 	mov	eax, ebx
 	mul	esi
 	mov	eax, edx
 	mov	edx, [rem_y]
 	imul	eax, edx
 	neg	edx
-	add	edx, [scl_height_pixels]
+	add	edx, [dst_height_pixels]
 	imul	ecx, edx
 	add	eax, ecx
-	mul	[scl_height_pixels_inv]
+	mul	[dst_height_pixels_inv]
 	mov	byte[edi], dl
 	add	edi, 1
 	add	[dst_x], 1
 	mov	eax, [dst_x]
-	cmp	eax, [scl_width_pixels]
+	cmp	eax, [dst_width_pixels]
 	jne	.bilinear.bpp8g.pixel
 	add	[dst_y], 1
 	mov	eax, [dst_y]
   .bilinear.bpp24.line:
 	mov	esi, [src_data]
 	mov	[dst_x], 0
 	imul	eax, [crop_height_pixels_m1]
 	xor	edx, edx
-	div	[scl_height_pixels]
+	div	[dst_height_pixels]
 	mov	[rem_y], edx
 	imul	eax, [src_width_bytes]
 	add	esi, eax
 	mov	[src_base], esi
 	mov	eax, 0	; mov eax, [dst_x]
   .bilinear.bpp24.pixel:
 	mov	esi, [src_base]
 	imul	eax, [crop_width_pixels_m1]
 	xor	edx, edx
-	div	[scl_width_pixels]
+	div	[dst_width_pixels]
 	lea	eax, [eax*3]
 	add	esi, eax
 	and	eax, 0x000000ff
 	imul	edx, esi
 	imul	ecx, esi
 	neg	esi
-	add	esi, [scl_width_pixels]
+	add	esi, [dst_width_pixels]
 	imul	eax, esi
 	imul	ebx, esi
 	add	eax, edx
 	add	ebx, ecx
-	mov	esi, [scl_width_pixels_inv]
+	mov	esi, [dst_width_pixels_inv]
 	mul	esi
 	mov	ecx, edx
 	mov	eax, ebx
 	mul	esi
 	mov	eax, edx
 	mov	edx, [rem_y]
 	imul	eax, edx
 	neg	edx
-	add	edx, [scl_height_pixels]
+	add	edx, [dst_height_pixels]
 	imul	ecx, edx
 	add	eax, ecx
-	mul	[scl_height_pixels_inv]
+	mul	[dst_height_pixels_inv]
 	mov	byte[edi], dl
 	add	edi, 1
 end repeat
 	add	[dst_x], 1
 	mov	eax, [dst_x]
-	cmp	eax, [scl_width_pixels]
+	cmp	eax, [dst_width_pixels]
 	jne	.bilinear.bpp24.pixel
 	add	[dst_y], 1
 	mov	eax, [dst_y]
   .bilinear.bpp32.line:
 	mov	esi, [src_data]
 	mov	[dst_x], 0
 	imul	eax, [crop_height_pixels_m1]
 	xor	edx, edx
-	div	[scl_height_pixels]
+	div	[dst_height_pixels]
 	mov	[rem_y], edx
 	imul	eax, [src_width_bytes]
 	add	esi, eax
 	mov	[src_base], esi
 	mov	eax, 0	; mov eax, [dst_x]
   .bilinear.bpp32.pixel:
 	mov	esi, [src_base]
 	imul	eax, [crop_width_pixels_m1]
 	xor	edx, edx
-	div	[scl_width_pixels]
+	div	[dst_width_pixels]
 	shl	eax, 2
 	add	esi, eax
 	and	eax, 0x000000ff
 	imul	edx, esi
 	imul	ecx, esi
 	neg	esi
-	add	esi, [scl_width_pixels]
+	add	esi, [dst_width_pixels]
 	imul	eax, esi
 	imul	ebx, esi
 	add	eax, edx
 	add	ebx, ecx
-	mov	esi, [scl_width_pixels_inv]
+	mov	esi, [dst_width_pixels_inv]
 	mul	esi
 	mov	ecx, edx
 	mov	eax, ebx
 	mul	esi
 	mov	eax, edx
 	mov	edx, [rem_y]
 	imul	eax, edx
 	neg	edx
-	add	edx, [scl_height_pixels]
+	add	edx, [dst_height_pixels]
 	imul	ecx, edx
 	add	eax, ecx
-	mul	[scl_height_pixels_inv]
+	mul	[dst_height_pixels_inv]
 	mov	byte[edi], dl
 	add	edi, 1
 end repeat
 	add	[dst_x], 1
 	mov	eax, [dst_x]
-	cmp	eax, [scl_width_pixels]
+	cmp	eax, [dst_width_pixels]
 	jne	.bilinear.bpp32.pixel
 	add	[dst_y], 1
 	mov	eax, [dst_y]

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libimg/scale.asm – Rev 3036 → 3053