This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from ba3e550 x2gokdrive*.c: Declare and zero-define several more variables. new 889a3f2 x2gokdriveremote.c: Two nasty typos fixed... new 83c4f68 x2gokdriveremote.c: Fix regresion introduced by 8e45834. Re-add dropped "sent = 0" in for loop. new 025ecc6 x2gokdriveremote.c: Some beautifications around variable declarations. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2gokdriveremote.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 889a3f2b543f7db841617b15a8e982013340481a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 01:08:21 2019 +0200 x2gokdriveremote.c: Two nasty typos fixed... --- x2gokdriveremote.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 7b1da19..855c09c 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -1298,7 +1298,7 @@ void sendMainImageFromSendThread(uint32_t width, uint32_t height, int32_t dx ,in pthread_mutex_lock(&remoteVars.mainimg_mutex); - for(int j=0;j<9;++i) + for(int j=0;j<9;++j) { regions[j].rect.size.width=0; regions[j].source_crc=0; @@ -1985,7 +1985,7 @@ clientReadNotify(int fd, int ready, void *data) EPHYR_DBG("Client want resize to %dx%d",width,height); memset(screens,0, sizeof(struct VirtScreen)*4); - for(int j=0;j<4;++i) + for(int j=0;j<4;++j) { char* record=buff+9+i*8; screens[j].width=*((uint16_t*)record); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 83c4f685c54f0de50b10b69707f47224f59c5c16 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 18 20:32:35 2019 +0200 x2gokdriveremote.c: Fix regresion introduced by 8e45834. Re-add dropped "sent = 0" in for loop. --- x2gokdriveremote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 855c09c..992683b 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -398,6 +398,7 @@ int32_t send_frame(u_int32_t width, uint32_t height, uint32_t x, uint32_t y, uin *((uint32_t*)buffer+6)=regions[i].rect.size.height; *((uint32_t*)buffer+7)=regions[i].size; + sent = 0; // #warning check this ln=write(remoteVars.clientsock, buffer, 64); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 025ecc6be80e2c11bcd0598ae5b6c9bd12d6a33f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 18 20:33:00 2019 +0200 x2gokdriveremote.c: Some beautifications around variable declarations. --- x2gokdriveremote.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 992683b..c60ef7c 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -302,10 +302,10 @@ void remote_sendCursor(CursorPtr cursor) static int32_t send_cursor(struct cursorFrame* cursor) { + unsigned char buffer[64] = {0}; _X_UNUSED int ln = 0; int l = 0; - int sent=0; - unsigned char buffer[64] = {0}; + int sent = 0; *((uint32_t*)buffer)=CURSOR; //4B @@ -349,13 +349,13 @@ int32_t send_cursor(struct cursorFrame* cursor) static int32_t send_frame(u_int32_t width, uint32_t height, uint32_t x, uint32_t y, uint32_t crc, struct frame_region* regions) { - - uint32_t numofregions=0; + unsigned char buffer[64] = {0}; _X_UNUSED int ln = 0; int l = 0; - uint32_t total=0; int sent = 0; - unsigned char buffer[64] = {0}; + + uint32_t total=0; + uint32_t numofregions=0; for(int i=0;i<9;++i) { @@ -437,7 +437,7 @@ int send_deleted_elements(void) _X_UNUSED int ln = 0; int l = 0; - int length, sent=0; + int length, sent = 0; unsigned int i = 0; struct deleted_elem* elem = NULL; @@ -487,6 +487,7 @@ int send_deleted_cursors(void) _X_UNUSED int ln = 0; int l = 0; int length, sent = 0; + unsigned int i=0; struct deletedCursor* elem = NULL; @@ -2395,12 +2396,12 @@ static void PngWriteCallback(png_structp png_ptr, png_bytep data, png_size_t le unsigned char* png_compress( uint32_t image_width, uint32_t image_height, unsigned char* RGBA_buffer, uint32_t* png_size) { - unsigned char** rows=calloc(sizeof(unsigned char*),image_height); struct { uint32_t* size; unsigned char *out; - }outdata; + } outdata; + unsigned char** rows = NULL; png_structp p = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); @@ -2414,6 +2415,8 @@ unsigned char* png_compress( uint32_t image_width, uint32_t image_height, *png_size=0; + rows = calloc(sizeof(unsigned char*), image_height); + outdata.size=png_size; outdata.out=0; @@ -2945,15 +2948,15 @@ remote_paint_rect(KdScreenInfo *screen, dirtyx_min=dx+width; dirtyy_min=dy+height; - maxdiff=2; - mindiff=-2; - /* * OK, here we assuming that XSERVERBPP is 4. If not, we'll have troubles * but it should work faster like this */ pthread_mutex_lock(&remoteVars.mainimg_mutex); + maxdiff=2; + mindiff=-2; + /* check if updated rec really is as big */ for(int32_t y=dy; y< dy+height;++y) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org