Jon Trulson wrote:
On Thu, 20 Feb 2014, alx wrote:
Hello,
I've got a couple of patches here.
- Missing copy constructor in WWL caused dtinfo to crash when setting
browser geometry in preferences.
- clib complaining about invalid file handle fclosed in dtfile.
- Cosmic Flame Fractals screensaver lost its drawing code. There were
unused variables involved, I guess the useful part went with them
during some cleanups :)
Looks nice, but please submit them in git 'format-patch' format please
:)
Aw, sorry, I'm mixing up things :) These ought to be the proper ones.
>From a038d48e52a129fdf64080aced6c9027389ecf26 Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Fri, 21 Feb 2014 15:18:36 +0100
Subject: [PATCH 1/3] dtfile: fclose called twice on same handle
---
cde/programs/dtfile/Directory.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/cde/programs/dtfile/Directory.c b/cde/programs/dtfile/Directory.c
index 6a4607d..8f02d24 100644
--- a/cde/programs/dtfile/Directory.c
+++ b/cde/programs/dtfile/Directory.c
@@ -1683,7 +1683,6 @@ ReadDirectoryProcess(
}
XtFree( (char *)position_info );
- fclose(fptr);
}
XtFree(full_directory_name);
--
1.8.4
>From 3c621f2e3db5294de23797190ebb2b723e72db20 Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Fri, 21 Feb 2014 15:21:20 +0100
Subject: [PATCH 2/3] dtscreen: cosmic flame fractals missing drawing code
---
cde/programs/dtscreen/flame.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cde/programs/dtscreen/flame.c b/cde/programs/dtscreen/flame.c
index e4cfbca..48e7a0e 100644
--- a/cde/programs/dtscreen/flame.c
+++ b/cde/programs/dtscreen/flame.c
@@ -128,6 +128,8 @@ recurse(fs, x, y, l)
return False;
if (x > -1.0 && x < 1.0 && y > -1.0 && y < 1.0) {
+ fs->pts[fs->num_points].x = (int) ((fs->width / 2) * (x + 1.0));
+ fs->pts[fs->num_points].y = (int) ((fs->height / 2) * (y + 1.0));
fs->num_points++;
if (fs->num_points > MAXBATCH) { /* point buffer size */
XDrawPoints(dsp, fs->pwin->w, fs->pwin->gc, fs->pts,
--
1.8.4
>From 00601baa240aa123c5529de4f8269b54620e8a2e Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Fri, 21 Feb 2014 15:29:15 +0100
Subject: [PATCH 3/3] wwl: fixed dtinfo segfault due to missing copy
constructor in WArgList
---
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h | 2 ++
cde/programs/dtinfo/dtinfo/wwl/src/WArgList.C | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h
b/cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h
index 61beed9..9f3e845 100644
--- a/cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h
+++ b/cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h
@@ -95,6 +95,8 @@ public :
delete [] args;
}
}
+
+ WArgList(const WArgList &r);
inline ArgList Args() const { return args; }
inline Cardinal NumArgs() const { return num_args; }
diff --git a/cde/programs/dtinfo/dtinfo/wwl/src/WArgList.C
b/cde/programs/dtinfo/dtinfo/wwl/src/WArgList.C
index 07d6583..363e7d8 100644
--- a/cde/programs/dtinfo/dtinfo/wwl/src/WArgList.C
+++ b/cde/programs/dtinfo/dtinfo/wwl/src/WArgList.C
@@ -162,6 +162,14 @@ WArgList::WArgList (String name, XtArgVal value, ...)
va_end (argv);
}
+WArgList::WArgList(const WArgList &r)
+{
+ num_args = r.num_args;
+ alloc_args = num_args;
+ args = new Arg[num_args];
+ memcpy(args, r.args, sizeof(Arg)*num_args);
+}
+
/*?nodoc?*/
Arg&
WArgList::Grow (Cardinal n)
--
1.8.4
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
