Skip to content

Commit

Permalink
v2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
septs committed Jun 27, 2022
1 parent f7208b7 commit 2d57fa3
Show file tree
Hide file tree
Showing 51 changed files with 2,345 additions and 386 deletions.
15 changes: 13 additions & 2 deletions Jambase
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,14 @@ echo "CC = " $(CC) ;
MSVCNT ?= $(MSVCDIR) ;
}

if [ MATCH 16\\.(.*) : $(VisualStudioVersion) ] {
if [ MATCH 17\\.(.*) : $(VisualStudioVersion) ] {
if $(VSCMD_ARG_TGT_ARCH) = "x64" {
ECHO "Compiler is VC++17 64 bit" ;
} else {
ECHO "Compiler is VC++17 32 bit" ;
}
MSVCVER = 17 ;
} else if [ MATCH 16\\.(.*) : $(VisualStudioVersion) ] {
ECHO "Compiler is VC++16 (AKA Community 2019)" ;
MSVCVER = 16 ;
} else if [ MATCH 15\\.(.*) : $(VisualStudioVersion) ] {
Expand All @@ -611,7 +618,7 @@ echo "CC = " $(CC) ;
MSVCVER = 11 ;
} else if $(VisualStudioVersion) {
ECHO "Compiler VC++, unknown version " ;
MSVCVER = 15 ;
MSVCVER = 17 ;
} else if [ MATCH (.*)VC\\+\\+10(.*) : $(MSVCNT) ] {
ECHO "Compiler is VC++10 32 bit" ;
MSVCVER = 10 ;
Expand Down Expand Up @@ -690,6 +697,10 @@ echo "CC = " $(CC) ;
CCDEBUGFLAG ?= /Od /Zi ; # /Zi creates debugging database
CCPROFFLAG ?= /Od /Zi ;
LINKDEBUGFLAG ?= /DEBUG ;
if $(MSVCVER) > 10 { # ?? which versions need this ??
CCDEBUGFLAG += /FS ; # Allow for parallel builds
CCPROFFLAG += /FS ;
}
}
LINKPROFFLAG ?= /PROFILE $(LINKDEBUGFLAG) ;
LINKOPTFLAG ?= /OPT:REF ;
Expand Down
1 change: 0 additions & 1 deletion Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ PREF_LINKFLAGS += $(LINKDEBUGFLAG) ; # Link debugging flags
SubInclude numlib ;
SubInclude plot ;
SubInclude icc ;
#SubInclude icc4 ;
SubInclude cgats ;
SubInclude xml ;
SubInclude yajl ;
Expand Down
6 changes: 3 additions & 3 deletions Readme.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Argyll CMS README file - Version 2.3.0
Argyll CMS README file - Version 2.3.1
--------------------------------------

Date: 24th December 2021
Date: 27th June 2022
Author: Graeme Gill

Introduction
Expand All @@ -26,7 +26,7 @@ provided for each major tool, and a general guide to using the tools for
typical color management tasks is also available. A mailing list provides
support for more advanced usage.

This is Version 2.3.0, a bug fix and feature change update to the last release V2.2.1.
This is Version 2.3.1, a bug fix update to the last release V2.3.0.
The first public release of icclib was in November 1998,
and of Argyll was in October 2000. Code development commenced in 1995. See
Changes Summary for an overview of changes since the last release. Changes
Expand Down
17 changes: 9 additions & 8 deletions ccast/ccmdns.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@ typedef int SOCKET;
/* Various DNS defines */
#define DNS_CLASS_IN 0x0001

// Used by ChromeCast
#define DNS_TYPE_PTR 12 /* Domain name pointer */
// DNS query type */
#define DNS_TYPE_A 1 /* Host IP address record */
#define DNS_TYPE_PTR 12 /* Canonical domain name */
#define DNS_TYPE_TXT 16 /* Text String */
#define DNS_TYPE_AAAA 28 /* Host IPV6 address record */
#define DNS_TYPE_SRV 33 /* Server selection (SRV) record */
#define DNS_TYPE_A 1 /* Host address (A) record */
#define DNS_TYPE_AAAA 28 /* IPv6 address ??? */
#define DNS_TYPE_NSEC 47 /* DNS Next Secure Name */


Expand Down Expand Up @@ -195,12 +195,13 @@ static char *print_IPV6_Address(ORD8 *buf) {
}
#endif

/* Write a DNS string to a buffer. */
/* return the offset of the next byte after the string */
/* Write a DNS string to a buffer. String has max length of 63 */
/* (because values higher than that are used for a compression scheme.) */
/* Return the offset of the next byte after the string */
static int write_string(ORD8 *buf, int off, char *s) {
int len = strlen(s);
if (len >= 0xc0)
len = 0xc0; // Hmm.
if (len > 63)
len = 63; // Hmm. Or what ?
buf[off] = len;
off++;
memcpy(buf + off, s, len);
Expand Down
2 changes: 1 addition & 1 deletion ccast/ccpacket.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Class to deal with TLS connection to ChromCast,
* and send and recieve packat format data.
* and send and recieve packet format data.
*
* Author: Graeme W. Gill
* Date: 3/9/2014
Expand Down
8 changes: 8 additions & 0 deletions cgats/cgats.c
Original file line number Diff line number Diff line change
Expand Up @@ -1956,6 +1956,10 @@ real_format(double value, int nsd, char *fmt) {
if (value < 1.0) {
int thr = -5;
ndigs = (int)(log10(value));
if (ndigs > 310 || ndigs < 310) { /* Protect against silliness.. */
strcpy(fmt,"%g");
return;
}
if (ndigs <= thr) {
sprintf(fmt,"%%%d.%de",xtot,tot-2);
return;
Expand All @@ -1965,6 +1969,10 @@ real_format(double value, int nsd, char *fmt) {
} else {
int thr = -0;
ndigs = (int)(log10(value));
if (ndigs > 310 || ndigs < 310) { /* Protect against silliness.. */
strcpy(fmt,"%g");
return;
}
if (ndigs >= (nsd + thr)) {
sprintf(fmt,"%%%d.%de",xtot,tot-2);
return;
Expand Down
Loading

0 comments on commit 2d57fa3

Please sign in to comment.