Skip to content

Commit a7b6a94

Browse files
committed
Eliminate uint type from platform-independent code.
1 parent 3d51398 commit a7b6a94

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

changes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Fixed or Mitigated Bugs
4444
- Modify `./configure` script to invoke `stat` with `-c` parameter instead
4545
of `--format` on busybox-style systems (partially fixes GitHub issue #400,
4646
"Building on postmarketOS on PinePhone").
47+
- Eliminate uint type from platform-independent code (concludes fix of
48+
GitHub issue #400, "Building on postmarketOS on PinePhone").
4749

4850

4951
Changes between 3.7.0.7 and 3.7.0.8

vfe/unix/vfeplatform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ namespace vfePlatform
324324
// on the requirements for these methods.
325325
/////////////////////////////////////////////////////////////////////////////
326326

327-
UnixShelloutProcessing::UnixShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height): ShelloutProcessing(opts, scene, width, height)
327+
UnixShelloutProcessing::UnixShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height): ShelloutProcessing(opts, scene, width, height)
328328
{
329329
m_ProcessRunning = false;
330330
m_ProcessId = m_LastError = m_ExitCode = 0;

vfe/unix/vfeplatform.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace vfePlatform
4747
class UnixShelloutProcessing: public ShelloutProcessing
4848
{
4949
public:
50-
UnixShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height);
50+
UnixShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height);
5151
~UnixShelloutProcessing();
5252

5353
virtual int ProcessID(void);
@@ -88,7 +88,7 @@ namespace vfePlatform
8888
virtual void NotifyCriticalError(const char *message, const char *file, int line);
8989
virtual int RequestNewOutputPath(int CallCount, const string& Reason, const UCS2String& OldPath, UCS2String& NewPath);
9090
virtual bool TestAccessAllowed(const Path& file, bool isWrite) const;
91-
virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height)
91+
virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height)
9292
{ return new UnixShelloutProcessing(opts, scene, width, height); }
9393

9494
shared_ptr<UnixOptionsProcessor> GetUnixOptions(void) { return m_OptionsProc; }

vfe/vfesession.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ namespace vfe
11921192

11931193
// Create an instance of the frontend ShelloutProcessing class. this handles creating and
11941194
// managing render shellout commands, and typically will need platform-specific implementation.
1195-
virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height) { return new ShelloutProcessing(opts, scene, width, height); }
1195+
virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height) { return new ShelloutProcessing(opts, scene, width, height); }
11961196

11971197
struct vfeSessionWorker
11981198
{

vfe/win/vfeplatform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ namespace vfePlatform
422422
/////////////////////////////////////////////////////////////////////////
423423
/////////////////////////////////////////////////////////////////////////
424424

425-
WinShelloutProcessing::WinShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height): ShelloutProcessing(opts, scene, width, height)
425+
WinShelloutProcessing::WinShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height): ShelloutProcessing(opts, scene, width, height)
426426
{
427427
m_ProcessRunning = false;
428428
m_ProcessId = m_LastError = m_ExitCode = 0;

vfe/win/vfeplatform.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace vfePlatform
4343
class WinShelloutProcessing: public ShelloutProcessing
4444
{
4545
public:
46-
WinShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height);
46+
WinShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height);
4747
~WinShelloutProcessing();
4848

4949
virtual int ProcessID(void);
@@ -88,7 +88,7 @@ namespace vfePlatform
8888
virtual int RequestNewOutputPath(int CallCount, const string& Reason, const UCS2String& OldPath, UCS2String& NewPath);
8989
virtual bool TestAccessAllowed(const Path& file, bool isWrite) const;
9090
virtual bool ImageOutputToStdoutSupported(void) const { return m_OptimizeForConsoleOutput; }
91-
virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, uint width, uint height) { return new WinShelloutProcessing(opts, scene, width, height); }
91+
virtual ShelloutProcessing *CreateShelloutProcessing(POVMS_Object& opts, const string& scene, unsigned int width, unsigned int height) { return new WinShelloutProcessing(opts, scene, width, height); }
9292

9393
virtual void Clear(bool Notify = true);
9494

0 commit comments

Comments
 (0)