Skip to content

Conversation

@PaulWessel
Copy link
Member

@PaulWessel PaulWessel commented Jul 8, 2020

The API functions to duplicate a CPT had double allocations and freeing of strings using the wrong functions. Also replace mysterious bit-values with named constants for readability. The man ages for makecpt and grd2cpt did not list the -h option (needed if you want to write CPT comments on output) and grd2cpt did not list the option (but did support it). A few minor correction to obscure test scripts that used awk to build cpts from parts. Closes #3613.

The API functions to duplicate a CPT had double allocations and freeing of strings using the wrong functions.
@PaulWessel PaulWessel changed the base branch from master to 6.1 July 8, 2020 03:21
@PaulWessel PaulWessel requested review from joa-quim and seisman July 8, 2020 03:21
@seisman
Copy link
Member

seisman commented Jul 8, 2020

All the CI jobs are failing now. The error is:

##[error]TF24668: The following team project collection is stopped: GenericMappingTools. 
Start the collection and then try again. Administrator Reason: abuse

See https://developercommunity.visualstudio.com/content/problem/1103605/pipeline-wont-run-administrator-reason-abuse.html

@PaulWessel
Copy link
Member Author

What does that mean? I ran the full test locally and only grdgdal failed.

@seisman
Copy link
Member

seisman commented Jul 8, 2020

It possibly means there are some technical issues in Azure Pipelines. We have to wait for their fix.

@PaulWessel
Copy link
Member Author

Shell I change the branch to master for this and then you backport, @seisman ?

@seisman
Copy link
Member

seisman commented Jul 9, 2020

Yes,

@PaulWessel PaulWessel changed the base branch from 6.1 to master July 9, 2020 05:45
@PaulWessel
Copy link
Member Author

Done.

Copy link
Member

@seisman seisman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blindly approve. @PaulWessel feel free to merge it if you're confident about the PR.

The CI issue was possibly fixed a few hours ago, and may be working in next few days.

@PaulWessel
Copy link
Member Author

I will run all tests on macOS and CentOS first, locally. MacOs had no failures, awaiting slower laptop...

@PaulWessel PaulWessel merged commit 3548c76 into master Jul 9, 2020
@PaulWessel PaulWessel deleted the cpt-duplication branch July 9, 2020 08:20
@PaulWessel
Copy link
Member Author

I have merged this branch @seisman

@joa-quim
Copy link
Member

joa-quim commented Jul 9, 2020

So this means 6.1 is definitively dead?

seisman pushed a commit that referenced this pull request Jul 9, 2020
* Fix bugs in duplication of CPTs

The API functions to duplicate a CPT had double allocations and freeing of strings using the wrong functions.

* Update gmt_support.c

* Update gmt_support.c

* Missing -h in docs

* Add named constants
@seisman
Copy link
Member

seisman commented Jul 9, 2020

backport to 6.1 is done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

makecpt -G on CPTs with custon label info fails

4 participants