Aren/kolibrios
1
0
Fork 0
mirror of https://github.com/KolibriOS/kolibrios.git synced 2024-11-28 19:53:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

1) Correcting the "Scaling" module to new invoke.

Browse Source 
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:
Marat Zakiyanov (Mario79) 2011-06-13 18:13:55 +00:00
parent 64fb1eba94
commit 6c0fca8971
6 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/media/zsea/data.inc
View File

@ -38,7 +38,7 @@ lsz fitext,\
db 0 db 0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
Authors_text: 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 .2: db 'Authors:',0
.3: db 'Marat Zakiyanov aka Mario(Mario79)',0 .3: db 'Marat Zakiyanov aka Mario(Mario79)',0
.4: db 'zSea program, modules: cnv_bmp.obj,',0 .4: db 'zSea program, modules: cnv_bmp.obj,',0

5
programs/media/zsea/plugins/convert/convert.asm
View File

@ -350,6 +350,7 @@ START:
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
Convert24b: Convert24b:
pushad pushad
mov eax,dword [esp+36]
mov [pointer],eax mov [pointer],eax
mov eax,[eax+4] mov eax,[eax+4]
mov [image_file],eax mov [image_file],eax
@ -481,8 +482,8 @@ Convert24b:
align 16 align 16
EXPORTS: EXPORTS:
dd szStart, START dd szStart, START
dd szVersion, 0x00010001 dd szVersion, 0x00010002
dd szConv_24b, Convert24b dd szConv_24b, Convert24b
dd 0 dd 0
szStart db 'START',0 szStart db 'START',0

2
programs/media/zsea/plugins/rotate/rotate.asm
View File

@ -285,7 +285,7 @@ START:
align 16 align 16
EXPORTS: EXPORTS:
dd szStart, START dd szStart, START
dd szVersion, 0x00010001 dd szVersion, 0x00010002
dd 0 dd 0
szStart db 'START',0 szStart db 'START',0

10
programs/media/zsea/plugins/scaling/scaling.asm
View File

@ -38,6 +38,12 @@ include '../../../../macros.inc'
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
START: START:
pushad 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 mov [pointer],eax
test bx,bx test bx,bx
jnz @f jnz @f
@ -141,7 +147,7 @@ START:
; mov [ebx+44],eax ; mov [ebx+44],eax
.exit: .exit:
popad popad
ret ret 24
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
align 4 align 4
.scaling: .scaling:
@ -426,7 +432,7 @@ include 'b_filter.inc'
align 4 align 4
EXPORTS: EXPORTS:
dd szStart, START dd szStart, START
dd szVersion, 0x00010001 dd szVersion, 0x00010002
dd 0 dd 0
szStart db 'START',0 szStart db 'START',0

5
programs/media/zsea/zSea.asm
View File

@ -25,7 +25,7 @@
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ; 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 use32
org 0x0 org 0x0
@ -373,7 +373,8 @@ background:
cmp [img_resolution],24 cmp [img_resolution],24
je @f je @f
mov eax,image_file ; mov eax,image_file
push dword image_file
; call [plugin_convert_background] ; call [plugin_convert_background]
call [convert_Conv_24b] call [convert_Conv_24b]
mov ecx,[raw_pointer_2] mov ecx,[raw_pointer_2]

15
programs/media/zsea/zoom.inc
View File

@ -217,18 +217,23 @@ scaling:
; shr eax,16 ; shr eax,16
; mov [test4],eax ; mov [test4],eax
mov eax,image_file ; mov eax,image_file
mov edx,[scaling_mode] ; mov edx,[scaling_mode]
movzx esi,byte [filtering_flag] 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 ; pusha
; mcall 26,9 ; mcall 26,9
; mov [test1],eax ; mov [test1],eax
; popa ; popa
; call [plugin_scaling]
call [Scaling_Start] call [Scaling_Start]
; pusha ; pusha