mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2024-11-28 19:53:12 +03:00
1) Correcting the "Scaling" module to new invoke.
2) Some corrections for "RAW to RAW" and "Rotate" modules. git-svn-id: svn://kolibrios.org@1958 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
64fb1eba94
commit
6c0fca8971
@ -38,7 +38,7 @@ lsz fitext,\
|
||||
db 0
|
||||
;---------------------------------------------------------------------
|
||||
Authors_text:
|
||||
.1: db 'zSea version: 1.00 RC3 Date: 12/06/2011',0
|
||||
.1: db 'zSea version: 1.00 RC3 Date: 13/06/2011',0
|
||||
.2: db 'Authors:',0
|
||||
.3: db 'Marat Zakiyanov aka Mario(Mario79)',0
|
||||
.4: db 'zSea program, modules: cnv_bmp.obj,',0
|
||||
|
@ -350,6 +350,7 @@ START:
|
||||
;---------------------------------------------------------------------
|
||||
Convert24b:
|
||||
pushad
|
||||
mov eax,dword [esp+36]
|
||||
mov [pointer],eax
|
||||
mov eax,[eax+4]
|
||||
mov [image_file],eax
|
||||
@ -481,8 +482,8 @@ Convert24b:
|
||||
align 16
|
||||
EXPORTS:
|
||||
dd szStart, START
|
||||
dd szVersion, 0x00010001
|
||||
dd szConv_24b, Convert24b
|
||||
dd szVersion, 0x00010002
|
||||
dd szConv_24b, Convert24b
|
||||
dd 0
|
||||
|
||||
szStart db 'START',0
|
||||
|
@ -285,7 +285,7 @@ START:
|
||||
align 16
|
||||
EXPORTS:
|
||||
dd szStart, START
|
||||
dd szVersion, 0x00010001
|
||||
dd szVersion, 0x00010002
|
||||
dd 0
|
||||
|
||||
szStart db 'START',0
|
||||
|
@ -38,6 +38,12 @@ include '../../../../macros.inc'
|
||||
;---------------------------------------------------------------------
|
||||
START:
|
||||
pushad
|
||||
mov edi,dword [esp+56]
|
||||
mov esi,dword [esp+52]
|
||||
mov edx,dword [esp+48]
|
||||
mov ecx,dword [esp+44]
|
||||
mov ebx,dword [esp+40]
|
||||
mov eax,dword [esp+36]
|
||||
mov [pointer],eax
|
||||
test bx,bx
|
||||
jnz @f
|
||||
@ -141,7 +147,7 @@ START:
|
||||
; mov [ebx+44],eax
|
||||
.exit:
|
||||
popad
|
||||
ret
|
||||
ret 24
|
||||
;---------------------------------------------------------------------
|
||||
align 4
|
||||
.scaling:
|
||||
@ -426,7 +432,7 @@ include 'b_filter.inc'
|
||||
align 4
|
||||
EXPORTS:
|
||||
dd szStart, START
|
||||
dd szVersion, 0x00010001
|
||||
dd szVersion, 0x00010002
|
||||
dd 0
|
||||
|
||||
szStart db 'START',0
|
||||
|
@ -25,7 +25,7 @@
|
||||
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
;*****************************************************************************
|
||||
; v.1.0 rń3 12.06.2011
|
||||
; v.1.0 rń3 13.06.2011
|
||||
;******************************************************************************
|
||||
use32
|
||||
org 0x0
|
||||
@ -373,7 +373,8 @@ background:
|
||||
|
||||
cmp [img_resolution],24
|
||||
je @f
|
||||
mov eax,image_file
|
||||
; mov eax,image_file
|
||||
push dword image_file
|
||||
; call [plugin_convert_background]
|
||||
call [convert_Conv_24b]
|
||||
mov ecx,[raw_pointer_2]
|
||||
|
@ -217,18 +217,23 @@ scaling:
|
||||
; shr eax,16
|
||||
; mov [test4],eax
|
||||
|
||||
mov eax,image_file
|
||||
mov edx,[scaling_mode]
|
||||
; mov eax,image_file
|
||||
; mov edx,[scaling_mode]
|
||||
movzx esi,byte [filtering_flag]
|
||||
mov edi,[background_color]
|
||||
; mov edi,[background_color]
|
||||
|
||||
push dword [background_color] ;edi - background color
|
||||
push esi ; esi - filtering
|
||||
push dword [scaling_mode] ;edx - scaling mode
|
||||
push ecx ; ecx - start_coordinates
|
||||
push ebx ; ebx - new_size
|
||||
push dword image_file ;eax - convert data table
|
||||
|
||||
; pusha
|
||||
; mcall 26,9
|
||||
; mov [test1],eax
|
||||
; popa
|
||||
|
||||
; call [plugin_scaling]
|
||||
|
||||
call [Scaling_Start]
|
||||
|
||||
; pusha
|
||||
|
Loading…
Reference in New Issue
Block a user